devpts: Move the creation of /dev/pts/ptmx into fill_super
The code makes more sense here and things are just clearer.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index c59d39f2..4377354 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -425,11 +425,19 @@
set_nlink(inode, 2);
s->s_root = d_make_root(inode);
- if (s->s_root)
- return 0;
+ if (!s->s_root) {
+ pr_err("get root dentry failed\n");
+ goto fail;
+ }
- pr_err("get root dentry failed\n");
+ error = mknod_ptmx(s);
+ if (error)
+ goto fail_dput;
+ return 0;
+fail_dput:
+ dput(s->s_root);
+ s->s_root = NULL;
fail:
return error;
}
@@ -456,11 +464,6 @@
goto out_undo_sget;
s->s_flags |= MS_ACTIVE;
}
-
- error = mknod_ptmx(s);
- if (error)
- goto out_undo_sget;
-
return dget(s->s_root);
out_undo_sget: