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

Now that all FS_SINGLE filesystems are using ->get_sb(), FS_SINGLE
can die.

diff --git a/fs/super.c b/fs/super.c
index 91df8dd2bb229a45e7b8e0033f8223b1b9dd040e..f9f6a9802ad457cee2618e9debfbd70e236c928b 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -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);
 }
-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 *
 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);
        else if (type->fs_flags & FS_REQUIRES_DEV)
                sb = __get_sb_bdev(type, flags, name, data);
-       else if (type->fs_flags & FS_SINGLE)
-               sb = __get_sb_single(type, flags, name, data);
        else
                sb = __get_sb_nodev(type, flags, name, data);
        if (IS_ERR(sb))

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b2a0019e9e8b3f07a87aaac5b9c97ce6fbd93344..fdcc041f300ae2739f260f1fd0107c5182b6063d 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -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
                           * 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_LITTER      32 /* Keeps the tree in dcache */
 #define FS_ODD_RENAME  32768   /* Temporary stuff; will go away as soon