tidy up after d_make_root() conversion

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

1 files changed, 7 insertions, 17 deletions

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,