Merge tag 'pwm/for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[~andy/linux] / fs / autofs4 / inode.c

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index a3de082db6206aacd16fc01608a2528d86fe63d2..d7bd395ab5865d070b547ac31c03a85b58ae6c46 100644 (file)
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -212,10 +212,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
        struct autofs_info *ino;
        int pgrp;
        bool pgrp_set = false;
+       int ret = -EINVAL;
 
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
-               goto fail_unlock;
+               return -ENOMEM;
        DPRINTK("starting up, sbi = %p",sbi);
 
        s->s_fs_info = sbi;
@@ -249,8 +250,10 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
         * Get the root inode and dentry, but defer checking for errors.
         */
        ino = autofs4_new_ino(sbi);
-       if (!ino)
+       if (!ino) {
+               ret = -ENOMEM;
                goto fail_free;
+       }
        root_inode = autofs4_get_inode(s, S_IFDIR | 0755);
        root = d_make_root(root_inode);
        if (!root)
@@ -308,7 +311,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
                printk("autofs: could not open pipe file descriptor\n");
                goto fail_dput;
        }
-       if (autofs_prepare_pipe(pipe) < 0)
+       ret = autofs_prepare_pipe(pipe);
+       if (ret < 0)
                goto fail_fput;
        sbi->pipe = pipe;
        sbi->pipefd = pipefd;
@@ -336,8 +340,7 @@ fail_free:
        put_pid(sbi->oz_pgrp);
        kfree(sbi);
        s->s_fs_info = NULL;
-fail_unlock:
-       return -EINVAL;
+       return ret;
 }
 
 struct inode *autofs4_get_inode(struct super_block *sb, umode_t mode)