Commit 8e018235 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

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

Now that all FS_SINGLE filesystems are using ->get_sb(), FS_SINGLE
can die.
parent 7b0761c9
...@@ -802,11 +802,6 @@ static struct super_block *__get_sb_nodev(struct file_system_type *fs_type, ...@@ -802,11 +802,6 @@ static struct super_block *__get_sb_nodev(struct file_system_type *fs_type,
{ {
return get_sb_nodev(fs_type, flags, data, fill_super); return get_sb_nodev(fs_type, flags, data, fill_super);
} }
static struct super_block *__get_sb_single(struct file_system_type *fs_type,
int flags, char *dev_name, void * data)
{
return get_sb_single(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)
...@@ -825,8 +820,6 @@ do_kern_mount(const char *fstype, int flags, char *name, void *data) ...@@ -825,8 +820,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 if (type->fs_flags & FS_SINGLE)
sb = __get_sb_single(type, flags, name, data);
else else
sb = __get_sb_nodev(type, flags, name, data); sb = __get_sb_nodev(type, flags, name, data);
if (IS_ERR(sb)) if (IS_ERR(sb))
......
...@@ -91,7 +91,6 @@ extern int leases_enable, dir_notify_enable, lease_break_time; ...@@ -91,7 +91,6 @@ extern int leases_enable, dir_notify_enable, lease_break_time;
#define FS_NO_PRELIM 4 /* prevent preloading of dentries, even if #define FS_NO_PRELIM 4 /* prevent preloading of dentries, even if
* FS_NO_DCACHE is not set. * FS_NO_DCACHE is not set.
*/ */
#define FS_SINGLE 8 /* Filesystem that can have only one superblock */
#define FS_NOMOUNT 16 /* Never mount from userland */ #define FS_NOMOUNT 16 /* Never mount from userland */
#define FS_LITTER 32 /* Keeps the tree in dcache */ #define FS_LITTER 32 /* Keeps the tree in dcache */
#define FS_ODD_RENAME 32768 /* Temporary stuff; will go away as soon #define FS_ODD_RENAME 32768 /* Temporary stuff; will go away as soon
......
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