From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764225AbcINTHo (ORCPT ); Wed, 14 Sep 2016 15:07:44 -0400 Received: from out03.mta.xmission.com ([166.70.13.233]:54680 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764170AbcINTHk (ORCPT ); Wed, 14 Sep 2016 15:07:40 -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:35 -0500 Message-Id: <20160914185338.15126-3-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=1bkFX1-0000r5-F7;;;mid=<20160914185338.15126-3-ebiederm@xmission.com>;;;hst=in01.mta.xmission.com;;;ip=97.119.97.64;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX19NhgUPK36i/NWhXsMmIzR7e7mciAnCfhM= 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.7 XMSubLong Long Subject * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.3 TooManyTo_001 Multiple "To" Header Recipients 2x (uncommon) * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5001] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa07 1397; Body=1 Fuz1=1 Fuz2=1] * 0.1 XMSolicitRefs_0 Weightloss drug * 0.0 T_TooManySym_02 5+ unique symbols in subject * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa07 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Greg Kroah-Hartman , Jiri Slaby X-Spam-Relay-Country: X-Spam-Timing: total 159 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 3.3 (2.1%), b_tie_ro: 2.4 (1.5%), parse: 0.70 (0.4%), extract_message_metadata: 10 (6.1%), get_uri_detail_list: 0.81 (0.5%), tests_pri_-1000: 6 (3.5%), tests_pri_-950: 1.18 (0.7%), tests_pri_-900: 0.97 (0.6%), tests_pri_-400: 18 (11.4%), check_bayes: 17 (10.8%), b_tokenize: 4.8 (3.0%), b_tok_get_all: 5 (3.4%), b_comp_prob: 1.44 (0.9%), b_tok_touch_all: 2.8 (1.7%), b_finish: 0.73 (0.5%), tests_pri_0: 113 (71.1%), check_dkim_signature: 0.58 (0.4%), check_dkim_adsp: 3.2 (2.0%), tests_pri_500: 3.9 (2.5%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH tty-next 3/6] devpts: Simplify devpts_mount by using mount_nodev 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 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 | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 43773543a783..a48b40b0bd1e 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -451,24 +451,7 @@ fail: 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; - - s = sget(fs_type, NULL, 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; - } - return dget(s->s_root); - -out_undo_sget: - deactivate_locked_super(s); - return ERR_PTR(error); + return mount_nodev(fs_type, flags, data, devpts_fill_super); } static void devpts_kill_sb(struct super_block *sb) -- 2.8.3