diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-02-06 17:57:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-06 17:57:09 -0800 |
| commit | 90f348bda964cefc745a83045c82c0490a6943d6 (patch) | |
| tree | 6590e82f4edb9701dc558a4bdba50f2a198e5e9a | |
| parent | 70861a8b671858082263a72bc2e0e943f7cfad3a (diff) | |
[PATCH] (4/6) more ->get_sb()
we are done with nodev filesystems - removed dead code in super.c and
fs.h
| -rw-r--r-- | fs/super.c | 7 | ||||
| -rw-r--r-- | include/linux/fs.h | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/fs/super.c b/fs/super.c index f9f6a9802ad4..2a4cb3259dec 100644 --- a/fs/super.c +++ b/fs/super.c @@ -797,11 +797,6 @@ static struct super_block *__get_sb_bdev(struct file_system_type *fs_type, { return get_sb_bdev(fs_type, flags, dev_name, data, fill_super); } -static struct super_block *__get_sb_nodev(struct file_system_type *fs_type, - int flags, char *dev_name, void * data) -{ - return get_sb_nodev(fs_type, flags, data, fill_super); -} struct vfsmount * do_kern_mount(const char *fstype, int flags, char *name, void *data) @@ -820,8 +815,6 @@ do_kern_mount(const char *fstype, int flags, char *name, void *data) sb = type->get_sb(type, flags, name, data); else if (type->fs_flags & FS_REQUIRES_DEV) sb = __get_sb_bdev(type, flags, name, data); - else - sb = __get_sb_nodev(type, flags, name, data); if (IS_ERR(sb)) goto out_mnt; if (type->fs_flags & FS_NOMOUNT) diff --git a/include/linux/fs.h b/include/linux/fs.h index 8e3ce34f39da..68902b1c4240 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -964,17 +964,14 @@ struct super_block *get_sb_nodev(struct file_system_type *fs_type, int flags, void *data, int (*fill_super)(struct super_block *, void *, int)); -#define DECLARE_FSTYPE(var,type,read,flags) \ +#define DECLARE_FSTYPE_DEV(var,type,read) \ struct file_system_type var = { \ name: type, \ read_super: read, \ - fs_flags: flags, \ + fs_flags: FS_REQUIRES_DEV, \ owner: THIS_MODULE, \ } -#define DECLARE_FSTYPE_DEV(var,type,read) \ - DECLARE_FSTYPE(var,type,read,FS_REQUIRES_DEV) - /* Alas, no aliases. Too much hassle with bringing module.h everywhere */ #define fops_get(fops) \ (((fops) && (fops)->owner) \ |