tidy up after d_make_root() conversion

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

6 files changed, 26 insertions, 53 deletions

diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 15f24f362208..1c034b80d408 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -87,7 +87,7 @@
 static LIST_HEAD(service_processors);
 
 static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode);
-static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root);
+static void ibmasmfs_create_files (struct super_block *sb);
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent);
 
 
@@ -114,7 +114,6 @@ static struct file_system_type ibmasmfs_type = {
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
 {
         struct inode *root;
-        struct dentry *root_dentry;
 
         sb->s_blocksize = PAGE_CACHE_SIZE;
         sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -129,12 +128,11 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
         root->i_op = &simple_dir_inode_operations;
         root->i_fop = ibmasmfs_dir_ops;
 
-        root_dentry = d_make_root(root);
-        if (!root_dentry)
+        sb->s_root = d_make_root(root);
+        if (!sb->s_root)
                 return -ENOMEM;
-        sb->s_root = root_dentry;
 
-        ibmasmfs_create_files(sb, root_dentry);
+        ibmasmfs_create_files(sb);
         return 0;
 }
 
@@ -610,7 +608,7 @@ static const struct file_operations remote_settings_fops = {
 };
 
 
-static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root)
+static void ibmasmfs_create_files (struct super_block *sb)
 {
         struct list_head *entry;
         struct service_processor *sp;
@@ -619,7 +617,7 @@ static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root)
                 struct dentry *dir;
                 struct dentry *remote_dir;
                 sp = list_entry(entry, struct service_processor, node);
-                dir = ibmasmfs_create_dir(sb, root, sp->dirname);
+                dir = ibmasmfs_create_dir(sb, sb->s_root, sp->dirname);
                 if (!dir)
                         continue;
 
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index 277bb70b8d75..ee8fd037bb53 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -238,7 +238,6 @@ struct dentry *oprofilefs_mkdir(struct super_block *sb,
 static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct inode *root_inode;
-        struct dentry *root_dentry;
 
         sb->s_blocksize = PAGE_CACHE_SIZE;
         sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -251,13 +250,11 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
                 return -ENOMEM;
         root_inode->i_op = &simple_dir_inode_operations;
         root_inode->i_fop = &simple_dir_operations;
-        root_dentry = d_make_root(root_inode);
-        if (!root_dentry)
+        sb->s_root = d_make_root(root_inode);
+        if (!sb->s_root)
                 return -ENOMEM;
 
-        sb->s_root = root_dentry;
-
-        oprofile_create_files(sb, root_dentry);
+        oprofile_create_files(sb, sb->s_root);
 
         // FIXME: verify kill_litter_super removes our dentries
         return 0;
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index bdaef8e36020..06c175aee6a3 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -454,7 +454,6 @@ static const struct super_operations usbfs_ops = {
 static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct inode *inode;
-        struct dentry *root;
 
         sb->s_blocksize = PAGE_CACHE_SIZE;
         sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -462,12 +461,11 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_op = &usbfs_ops;
         sb->s_time_gran = 1;
         inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0);
-        root = d_make_root(inode);
-        if (!root) {
+        sb->s_root = d_make_root(inode);
+        if (!sb->s_root) {
                 dbg("%s: could not get root dentry!",__func__);
                 return -ENOMEM;
         }
-        sb->s_root = root;
         return 0;
 }
 
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index ec7d1fb6f35a..f37c32b94525 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -278,9 +278,7 @@ fail:
 
 int pstore_fill_super(struct super_block *sb, void *data, int silent)
 {
-        struct inode *inode = NULL;
-        struct dentry *root;
-        int err;
+        struct inode *inode;
 
         save_mount_options(sb, data);
 
@@ -296,25 +294,17 @@ int pstore_fill_super(struct super_block *sb, void *data, int silent)
         parse_options(data);
 
         inode = pstore_get_inode(sb, NULL, S_IFDIR | 0755, 0);
-        if (!inode) {
-                err = -ENOMEM;
-                goto fail;
-        }
-        /* override ramfs "dir" options so we catch unlink(2) */
-        inode->i_op = &pstore_dir_inode_operations;
-
-        root = d_make_root(inode);
-        sb->s_root = root;
-        if (!root) {
-                err = -ENOMEM;
-                goto fail;
+        if (inode) {
+                /* override ramfs "dir" options so we catch unlink(2) */
+                inode->i_op = &pstore_dir_inode_operations;
         }
+        sb->s_root = d_make_root(inode);
+        if (!sb->s_root)
+                return -ENOMEM;
 
         pstore_get_records(0);
 
         return 0;
-fail:
-        return err;
 }
 
 static struct dentry *pstore_mount(struct file_system_type *fs_type,
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index b6612d2ed718..a1fdabe21dec 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -209,21 +209,19 @@ static int ramfs_parse_options(char *data, struct ramfs_mount_opts *opts)
 int ramfs_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct ramfs_fs_info *fsi;
-        struct inode *inode = NULL;
+        struct inode *inode;
         int err;
 
         save_mount_options(sb, data);
 
         fsi = kzalloc(sizeof(struct ramfs_fs_info), GFP_KERNEL);
         sb->s_fs_info = fsi;
-        if (!fsi) {
-                err = -ENOMEM;
-                goto fail;
-        }
+        if (!fsi)
+                return -ENOMEM;
 
         err = ramfs_parse_options(data, &fsi->mount_opts);
         if (err)
-                goto fail;
+                return err;
 
         sb->s_maxbytes          = MAX_LFS_FILESIZE;
         sb->s_blocksize         = PAGE_CACHE_SIZE;
@@ -234,16 +232,10 @@ int ramfs_fill_super(struct super_block *sb, void *data, int silent)
 
         inode = ramfs_get_inode(sb, NULL, S_IFDIR | fsi->mount_opts.mode, 0);
         sb->s_root = d_make_root(inode);
-        if (!sb->s_root) {
-                err = -ENOMEM;
-                goto fail;
-        }
+        if (!sb->s_root)
+                return -ENOMEM;
 
         return 0;
-fail:
-        kfree(fsi);
-        sb->s_fs_info = NULL;
-        return err;
 }
 
 struct dentry *ramfs_mount(struct file_system_type *fs_type,
diff --git a/mm/shmem.c b/mm/shmem.c
index 154243f0a27c..9bc4a2353944 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2175,7 +2175,6 @@ static void shmem_put_super(struct super_block *sb)
 int shmem_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct inode *inode;
-        struct dentry *root;
         struct shmem_sb_info *sbinfo;
         int err = -ENOMEM;
 
@@ -2232,10 +2231,9 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
                 goto failed;
         inode->i_uid = sbinfo->uid;
         inode->i_gid = sbinfo->gid;
-        root = d_make_root(inode);
-        if (!root)
+        sb->s_root = d_make_root(inode);
+        if (!sb->s_root)
                 goto failed;
-        sb->s_root = root;
         return 0;
 
 failed: