Simplify devpts_get_sb() failure exits

postpone simple_set_mnt() until we know we won't fail. Signed-off-by: Al Viro <[email protected]>
jbg · May 21, 2010 · 8946807 · 8946807
1 parent a135aa2
commit 8946807
Showing 1 changed file with 3 additions and 6 deletions.
diff --git 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);