diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /fs/msdos | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'fs/msdos')
| -rw-r--r-- | fs/msdos/msdosfs_syms.c | 13 | ||||
| -rw-r--r-- | fs/msdos/namei.c | 25 |
2 files changed, 12 insertions, 26 deletions
diff --git a/fs/msdos/msdosfs_syms.c b/fs/msdos/msdosfs_syms.c index 8e9897f2f..7b578f00f 100644 --- a/fs/msdos/msdosfs_syms.c +++ b/fs/msdos/msdosfs_syms.c @@ -26,10 +26,17 @@ EXPORT_SYMBOL(msdos_unlink); EXPORT_SYMBOL(msdos_read_super); EXPORT_SYMBOL(msdos_put_super); +static DECLARE_FSTYPE_DEV(msdos_fs_type, "msdos", msdos_read_super); -DECLARE_FSTYPE_DEV(msdos_fs_type, "msdos", msdos_read_super); - -int __init init_msdos_fs(void) +static int __init init_msdos_fs(void) { return register_filesystem(&msdos_fs_type); } + +static void __exit exit_msdos_fs(void) +{ + unregister_filesystem(&msdos_fs_type); +} + +module_init(init_msdos_fs) +module_exit(exit_msdos_fs) diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c index 7febeaa8b..495df7cd1 100644 --- a/fs/msdos/namei.c +++ b/fs/msdos/namei.c @@ -599,28 +599,7 @@ struct super_block *msdos_read_super(struct super_block *sb,void *data, int sile MSDOS_SB(sb)->options.isvfat = 0; res = fat_read_super(sb, data, silent, &msdos_dir_inode_operations); - if (res == NULL) - goto out_fail; - sb->s_root->d_op = &msdos_dentry_operations; + if (res) + sb->s_root->d_op = &msdos_dentry_operations; return res; - -out_fail: - return NULL; -} - - - -#ifdef MODULE -int init_module(void) -{ - return init_msdos_fs(); } - - -void cleanup_module(void) -{ - unregister_filesystem(&msdos_fs_type); -} - -#endif - |