ANDROID: sdcardfs: use mount_nodev and fix a issue in sdcardfs_kill_sb

Use the VFS mount_nodev instead of customized mount_nodev_with_options
and fix generic_shutdown_super to kill_anon_super because of set_anon_super

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Change-Id: Ibe46647aa2ce49d79291aa9d0295e9625cfccd80

diff --git a/fs/sdcardfs/main.c b/fs/sdcardfs/main.c
index dd4b87c7cb1d957e7672fbc381131a910ec1f92d..5931c87c7a1bc0c027c5aa1070c728799d644a82 100644 (file)
--- a/fs/sdcardfs/main.c
+++ b/fs/sdcardfs/main.c
@@ -364,41 +364,34 @@ out:
        return err;
 }
 
-/* A feature which supports mount_nodev() with options */
-static struct dentry *mount_nodev_with_options(struct vfsmount *mnt,
-                       struct file_system_type *fs_type, int flags,
-                       const char *dev_name, void *data,
-                       int (*fill_super)(struct vfsmount *, struct super_block *,
-                                               const char *, void *, int))
+struct sdcardfs_mount_private {
+       struct vfsmount *mnt;
+       const char *dev_name;
+       void *raw_data;
+};
 
+static int __sdcardfs_fill_super(
+       struct super_block *sb,
+       void *_priv, int silent)
 {
-       int error;
-       struct super_block *s = sget(fs_type, NULL, set_anon_super, flags, NULL);
-
-       if (IS_ERR(s))
-               return ERR_CAST(s);
-
-       s->s_flags = flags;
+       struct sdcardfs_mount_private *priv = _priv;
 
-       error = fill_super(mnt, s, dev_name, data, flags & MS_SILENT ? 1 : 0);
-       if (error) {
-               deactivate_locked_super(s);
-               return ERR_PTR(error);
-       }
-       s->s_flags |= MS_ACTIVE;
-       return dget(s->s_root);
+       return sdcardfs_read_super(priv->mnt,
+               sb, priv->dev_name, priv->raw_data, silent);
 }
 
 static struct dentry *sdcardfs_mount(struct vfsmount *mnt,
                struct file_system_type *fs_type, int flags,
                            const char *dev_name, void *raw_data)
 {
-       /*
-        * dev_name is a lower_path_name,
-        * raw_data is a option string.
-        */
-       return mount_nodev_with_options(mnt, fs_type, flags, dev_name,
-                                               raw_data, sdcardfs_read_super);
+       struct sdcardfs_mount_private priv = {
+               .mnt = mnt,
+               .dev_name = dev_name,
+               .raw_data = raw_data
+       };
+
+       return mount_nodev(fs_type, flags,
+               &priv, __sdcardfs_fill_super);
 }
 
 static struct dentry *sdcardfs_mount_wrn(struct file_system_type *fs_type,
@@ -423,7 +416,7 @@ void sdcardfs_kill_sb(struct super_block *sb)
                list_del(&sbi->list);
                mutex_unlock(&sdcardfs_super_list_lock);
        }
-       generic_shutdown_super(sb);
+       kill_anon_super(sb);
 }
 
 static struct file_system_type sdcardfs_fs_type = {