From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764484AbcINTIw (ORCPT ); Wed, 14 Sep 2016 15:08:52 -0400 Received: from out03.mta.xmission.com ([166.70.13.233]:54667 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762523AbcINTHj (ORCPT ); Wed, 14 Sep 2016 15:07:39 -0400 From: "Eric W. Biederman" To: Greg Kroah-Hartman , Jiri Slaby Cc: "H. Peter Anvin" , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Linux Containers , "Eric W. Biederman" Date: Wed, 14 Sep 2016 13:53:34 -0500 Message-Id: <20160914185338.15126-2-ebiederm@xmission.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160914185338.15126-1-ebiederm@xmission.com> References: <87sht25n73.fsf@x220.int.ebiederm.org> <20160914185338.15126-1-ebiederm@xmission.com> X-XM-SPF: eid=1bkFWz-0000r5-1V;;;mid=<20160914185338.15126-2-ebiederm@xmission.com>;;;hst=in01.mta.xmission.com;;;ip=97.119.97.64;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX1/x5/on8SbLxL8ELnfPbgfc4Y99MpPOo3U= X-SA-Exim-Connect-IP: 97.119.97.64 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.3 TooManyTo_001 Multiple "To" Header Recipients 2x (uncommon) * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.7 XMSubLong Long Subject * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5002] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa06 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_02 5+ unique symbols in subject * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Greg Kroah-Hartman , Jiri Slaby X-Spam-Relay-Country: X-Spam-Timing: total 229 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 3.2 (1.4%), b_tie_ro: 2.3 (1.0%), parse: 0.71 (0.3%), extract_message_metadata: 10 (4.4%), get_uri_detail_list: 0.78 (0.3%), tests_pri_-1000: 6 (2.5%), tests_pri_-950: 1.15 (0.5%), tests_pri_-900: 0.96 (0.4%), tests_pri_-400: 17 (7.2%), check_bayes: 16 (6.8%), b_tokenize: 4.7 (2.1%), b_tok_get_all: 4.7 (2.1%), b_comp_prob: 1.38 (0.6%), b_tok_touch_all: 2.7 (1.2%), b_finish: 0.63 (0.3%), tests_pri_0: 183 (80.1%), check_dkim_signature: 0.44 (0.2%), check_dkim_adsp: 2.9 (1.3%), tests_pri_500: 4.6 (2.0%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH tty-next 2/6] devpts: Move the creation of /dev/pts/ptmx into fill_super X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The code makes more sense here and things are just clearer. Signed-off-by: "Eric W. Biederman" --- fs/devpts/inode.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index c59d39f2d512..43773543a783 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -425,11 +425,19 @@ devpts_fill_super(struct super_block *s, void *data, int silent) 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 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type, 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: -- 2.8.3