diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
| commit | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch) | |
| tree | 80a0499e57a4cc95b6caea559400b5226ebe606f /fs/filesystems.c | |
| parent | 86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff) | |
| parent | fd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/filesystems.c')
| -rw-r--r-- | fs/filesystems.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/filesystems.c b/fs/filesystems.c index da165f6adcbf..92567d95ba6a 100644 --- a/fs/filesystems.c +++ b/fs/filesystems.c | |||
| @@ -273,7 +273,7 @@ struct file_system_type *get_fs_type(const char *name) | |||
| 273 | int len = dot ? dot - name : strlen(name); | 273 | int len = dot ? dot - name : strlen(name); |
| 274 | 274 | ||
| 275 | fs = __get_fs_type(name, len); | 275 | fs = __get_fs_type(name, len); |
| 276 | if (!fs && (request_module("%.*s", len, name) == 0)) | 276 | if (!fs && (request_module("fs-%.*s", len, name) == 0)) |
| 277 | fs = __get_fs_type(name, len); | 277 | fs = __get_fs_type(name, len); |
| 278 | 278 | ||
| 279 | if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { | 279 | if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { |