Merge branch 'gpe-regression-fixes' into release

[linux-2.6-microblaze.git] / fs / devpts / inode.c

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 0120247..8b3ffd5 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -384,18 +384,15 @@ static int devpts_get_sb(struct file_system_type *fs_type,
                s->s_flags |= MS_ACTIVE;
        }
 
-       simple_set_mnt(mnt, s);
-
        memcpy(&(DEVPTS_SB(s))->mount_opts, &opts, sizeof(opts));
 
        error = mknod_ptmx(s);
        if (error)
-               goto out_dput;
+               goto out_undo_sget;
 
-       return 0;
+       simple_set_mnt(mnt, s);
 
-out_dput:
-       dput(s->s_root); /* undo dget() in simple_set_mnt() */
+       return 0;
 
 out_undo_sget:
        deactivate_locked_super(s);