Commit 90f348bd authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] (4/6) more ->get_sb()

we are done with nodev filesystems - removed dead code in super.c and
fs.h
parent 70861a8b
...@@ -797,11 +797,6 @@ static struct super_block *__get_sb_bdev(struct file_system_type *fs_type, ...@@ -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); 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 * struct vfsmount *
do_kern_mount(const char *fstype, int flags, char *name, void *data) 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) ...@@ -820,8 +815,6 @@ do_kern_mount(const char *fstype, int flags, char *name, void *data)
sb = type->get_sb(type, flags, name, data); sb = type->get_sb(type, flags, name, data);
else if (type->fs_flags & FS_REQUIRES_DEV) else if (type->fs_flags & FS_REQUIRES_DEV)
sb = __get_sb_bdev(type, flags, name, data); sb = __get_sb_bdev(type, flags, name, data);
else
sb = __get_sb_nodev(type, flags, name, data);
if (IS_ERR(sb)) if (IS_ERR(sb))
goto out_mnt; goto out_mnt;
if (type->fs_flags & FS_NOMOUNT) if (type->fs_flags & FS_NOMOUNT)
......
...@@ -964,17 +964,14 @@ struct super_block *get_sb_nodev(struct file_system_type *fs_type, ...@@ -964,17 +964,14 @@ struct super_block *get_sb_nodev(struct file_system_type *fs_type,
int flags, void *data, int flags, void *data,
int (*fill_super)(struct super_block *, void *, int)); 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 = { \ struct file_system_type var = { \
name: type, \ name: type, \
read_super: read, \ read_super: read, \
fs_flags: flags, \ fs_flags: FS_REQUIRES_DEV, \
owner: THIS_MODULE, \ 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 */ /* Alas, no aliases. Too much hassle with bringing module.h everywhere */
#define fops_get(fops) \ #define fops_get(fops) \
(((fops) && (fops)->owner) \ (((fops) && (fops)->owner) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment