vfs: remove duplicate code in get_fs_type()
save 14 bytes: text data bss dec hex filename 1354 32 4 1390 56e fs/filesystems.o.before text data bss dec hex filename 1340 32 4 1376 560 fs/filesystems.o Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
4c728ef583
commit
d8e9650dff
1 changed files with 13 additions and 10 deletions
|
@ -253,24 +253,27 @@ static int __init proc_filesystems_init(void)
|
|||
module_init(proc_filesystems_init);
|
||||
#endif
|
||||
|
||||
struct file_system_type *get_fs_type(const char *name)
|
||||
static struct file_system_type *__get_fs_type(const char *name, int len)
|
||||
{
|
||||
struct file_system_type *fs;
|
||||
const char *dot = strchr(name, '.');
|
||||
unsigned len = dot ? dot - name : strlen(name);
|
||||
|
||||
read_lock(&file_systems_lock);
|
||||
fs = *(find_filesystem(name, len));
|
||||
if (fs && !try_module_get(fs->owner))
|
||||
fs = NULL;
|
||||
read_unlock(&file_systems_lock);
|
||||
if (!fs && (request_module("%.*s", len, name) == 0)) {
|
||||
read_lock(&file_systems_lock);
|
||||
fs = *(find_filesystem(name, len));
|
||||
if (fs && !try_module_get(fs->owner))
|
||||
fs = NULL;
|
||||
read_unlock(&file_systems_lock);
|
||||
}
|
||||
return fs;
|
||||
}
|
||||
|
||||
struct file_system_type *get_fs_type(const char *name)
|
||||
{
|
||||
struct file_system_type *fs;
|
||||
const char *dot = strchr(name, '.');
|
||||
int len = dot ? dot - name : strlen(name);
|
||||
|
||||
fs = __get_fs_type(name, len);
|
||||
if (!fs && (request_module("%.*s", len, name) == 0))
|
||||
fs = __get_fs_type(name, len);
|
||||
|
||||
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
|
||||
put_filesystem(fs);
|
||||
|
|
Loading…
Reference in a new issue