Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597AbcDOPve (ORCPT ); Fri, 15 Apr 2016 11:51:34 -0400 Received: from out03.mta.xmission.com ([166.70.13.233]:37911 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745AbcDOPuL (ORCPT ); Fri, 15 Apr 2016 11:50:11 -0400 From: "Eric W. Biederman" To: Linus Torvalds Cc: "H. Peter Anvin" , Andy Lutomirski , security@debian.org, security@kernel.org, Al Viro , security@ubuntu.com, Peter Hurley , Serge Hallyn , Willy Tarreau , Aurelien Jarno , One Thousand Gnomes , Jann Horn , Greg KH , Linux Kernel Mailing List , Jiri Slaby , Florian Weimer , "Eric W. Biederman" Date: Fri, 15 Apr 2016 10:35:29 -0500 Message-Id: <1460734532-20134-13-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1460734532-20134-1-git-send-email-ebiederm@xmission.com> References: <877ffyzy1j.fsf_-_@x220.int.ebiederm.org> <1460734532-20134-1-git-send-email-ebiederm@xmission.com> X-XM-AID: U2FsdGVkX1/ekKnaT9+wxZzDWx/xZRomjdYXB1eTrZ8= X-SA-Exim-Connect-IP: 67.3.249.252 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.7 XMSubLong Long Subject * 1.5 XMNoVowels Alpha-numberic number with no vowels * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; Body=1 Fuz1=1 Fuz2=30] * 0.1 XMSolicitRefs_0 Weightloss drug * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa04 1397; Body=1 Fuz1=1 Fuz2=30 X-Spam-Combo: **;Linus Torvalds X-Spam-Relay-Country: X-Spam-Timing: total 231 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 3.2 (1.4%), b_tie_ro: 2.3 (1.0%), parse: 0.59 (0.3%), extract_message_metadata: 9 (4.0%), get_uri_detail_list: 0.95 (0.4%), tests_pri_-1000: 5 (2.2%), tests_pri_-950: 0.89 (0.4%), tests_pri_-900: 0.77 (0.3%), tests_pri_-400: 18 (7.9%), check_bayes: 18 (7.6%), b_tokenize: 4.9 (2.1%), b_tok_get_all: 6 (2.6%), b_comp_prob: 1.26 (0.5%), b_tok_touch_all: 3.0 (1.3%), b_finish: 0.60 (0.3%), tests_pri_0: 184 (79.8%), check_dkim_signature: 0.38 (0.2%), check_dkim_adsp: 2.3 (1.0%), tests_pri_500: 6 (2.8%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 13/16] devpts: Simplify devpts_mount by using mount_nodev X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -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 Content-Length: 1666 Lines: 58 Now that all of the work of setting up a superblock has been moved to devpts_fill_super simplify devpts_mount by calling mount_nodev instead of rolling mount_nodev by hand. Signed-off-by: "Eric W. Biederman" --- fs/devpts/inode.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 3aa223803a08..c1c346190f35 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -467,7 +467,6 @@ static int compare_init_pts_sb(struct super_block *s, void *p) static struct dentry *devpts_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { - int error; struct super_block *s; bool newinstance; @@ -480,30 +479,16 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type, return ERR_PTR(-EINVAL); if (newinstance) - s = sget(fs_type, NULL, set_anon_super, flags, NULL); - else - s = sget(fs_type, compare_init_pts_sb, set_anon_super, flags, - NULL); + return mount_nodev(fs_type, flags, data, devpts_fill_super); + s = sget(fs_type, compare_init_pts_sb, set_anon_super, flags, NULL); if (IS_ERR(s)) return ERR_CAST(s); - if (!s->s_root) { - error = devpts_fill_super(s, data, flags & MS_SILENT ? 1 : 0); - if (error) - goto out_undo_sget; - - s->s_flags |= MS_ACTIVE; - } else { - /* Match mount_single ignore errors on remount */ - devpts_remount(s, &flags, data); - } + /* Match mount_single ignore errors on remount */ + devpts_remount(s, &flags, data); return dget(s->s_root); - -out_undo_sget: - deactivate_locked_super(s); - return ERR_PTR(error); } #else -- 2.8.1