From d7fe3c00a4f66cf46aad7d15676e80cb2f7e5cea Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 20 Mar 2010 21:57:43 -0400
Subject: [PATCH] --- yaml --- r: 197933 b: refs/heads/master c:
 894680710d813137077ad7cb351b713f64cabbdf h: refs/heads/master i:   197931:
 376e15960f459a6d326d9e7f0d794897396f08d9 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/devpts/inode.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 54ee0377816c..2b2e867c2766 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a135aa2cd76a1de1a84312e0bb3498a5da76782d
+refs/heads/master: 894680710d813137077ad7cb351b713f64cabbdf
diff --git a/trunk/fs/devpts/inode.c b/trunk/fs/devpts/inode.c
index 0120247b41c0..8b3ffd5b5235 100644
--- a/trunk/fs/devpts/inode.c
+++ b/trunk/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);