autofs: fix autofs4_fill_super() error exit handling

Somewhere along the line the error handling gotos have become incorrect.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ian Kent <[email protected]>
Cc: Tomohiro Kusumi <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index d76573f622780756a097e575bb1132d899168b3a..3f486c1f5f43a1c6e600fa5a84cf837f50823a41 100644 (file)
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -313,7 +313,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
 
        if (!pipe) {
                pr_err("could not open pipe file descriptor\n");
-               goto fail_dput;
+               goto fail_put_pid;
        }
        ret = autofs_prepare_pipe(pipe);
        if (ret < 0)
@@ -334,14 +334,14 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
 fail_fput:
        pr_err("pipe file descriptor does not contain proper ops\n");
        fput(pipe);
-       /* fall through */
+fail_put_pid:
+       put_pid(sbi->oz_pgrp);
 fail_dput:
        dput(root);
        goto fail_free;
 fail_ino:
        kfree(ino);
 fail_free:
-       put_pid(sbi->oz_pgrp);
        kfree(sbi);
        s->s_fs_info = NULL;
        return ret;