Received: by 10.213.65.68 with SMTP id h4csp175222imn; Mon, 12 Mar 2018 10:15:23 -0700 (PDT) X-Google-Smtp-Source: AG47ELveSDlyBs+vHIm9TXBnljotvhiY0ujQt4V+LvlAFT/vhDQyz3buiYFcL+buwjrw9nHsSc4m X-Received: by 10.98.32.28 with SMTP id g28mr8763453pfg.182.1520874923462; Mon, 12 Mar 2018 10:15:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520874923; cv=none; d=google.com; s=arc-20160816; b=XTphxxlnIfURX4Y8K13FyDGXB5Hfv/psPLwtE0OqFUmJCIoLUcoA92FT83Ul+mwa3X fVJY8oIs1ZOvYUUQrVfmLY+V54ezTQnJ+2Tnc2SIw+LOZbzheqQnTbYetHQub/TmCHsZ /oXynsHodPs4YY6EM4d+sr209a5FBd9w6GlvxYxdwP3+Y2QUy8c4dpaJzQSqHJsTzXkc 1S9wo2r1hu9q8F0MEwIqeQ/5723HFSnXmiuQ6L5phCnRBf95ncrftvNyf5AzL7Dihvym GdQcYSxkTguEdB7B8/PS6SXKmfTu4FznekdaNwJ6/KF5Uf8U4H1zy8Nn9ADV9FcTJ/xu m6SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=axzEEkL1kN9//DTftRA266NFMF6k2Yzf7Sp7sg2iZkQ=; b=jKSCNHWilBfRloPGSktes6Qb82kP5ne3PLV+jp1pVLdr399PAYQba6YFWPRRL3AqNo 8+JpEan7CPB+QOFM1PJ56V/Mf122Dfq0soqDu26UV8QZ/QHVCUR+vYXof8TWfKNOPHqU cMejvKSUmzHhqzILvhN+6jVj1ah4hgVZZQgLZ5SMxhggw5r9LNzfuIi92vi0/giCsVvM UqCSkvJRIh1d07ee+IrW6hltqu0ZlavLZdx7ekWrzAMCdGXhZAdk9VVZHHLrf++kEYsE WKd2+kKRtJ42v0HGEfWnsnI9Exodr4IsQeOvBxELb6qp9Q6YaIDqj+n+ZNj6NpbtlA5x WvnA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t13si5958220pfa.294.2018.03.12.10.15.05; Mon, 12 Mar 2018 10:15:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932678AbeCLRNi (ORCPT + 99 others); Mon, 12 Mar 2018 13:13:38 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:32918 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932439AbeCLRNg (ORCPT ); Mon, 12 Mar 2018 13:13:36 -0400 Received: by mail-wm0-f65.google.com with SMTP id s206so14364009wme.0 for ; Mon, 12 Mar 2018 10:13:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=axzEEkL1kN9//DTftRA266NFMF6k2Yzf7Sp7sg2iZkQ=; b=QVY+Dn/F7dSKN0cByWdUQNN8h37CjdIOLgNqUV2G5btzJIB4vZuavE6ML+5KFDW1pl NdDLcs3dTRMXnhBhLTiEM/syTKbRGk5kRCnjG3gSWm2RABfdH2z1V1SC3ZHLrwHGblsC Y/G7L0mv+RxnBnMwfXG4yJDC/3aLEnxM7CIWNr7hqiZsZxhRSU95vOa2eoIRLsoUGbZh uJV0+sLVgZFhg55JEiM5tXn+qBEjkm1mKhLM3pG9EDDx9o5LSJPgQA7JXtsRhtBY5xcB CiHBeVPSI7Eqtj1T9bKZvECntB7T22T0DQq7T+tKdpcN5zjCA1kNgHLLCyqPcjpyA7ut +sMw== X-Gm-Message-State: AElRT7FWC7/f+P5AzPvsl/Ao2SB3y9h9SBrFNSp6u5aoDRwmTf8nsJrF YK4MJ3Ma60qM4ub0PaLfphp9VzR4 X-Received: by 10.28.65.84 with SMTP id o81mr6114777wma.19.1520874815269; Mon, 12 Mar 2018 10:13:35 -0700 (PDT) Received: from localhost.localdomain (u-086-c252.eap.uni-tuebingen.de. [134.2.86.252]) by smtp.gmail.com with ESMTPSA id x17sm10954864wrg.32.2018.03.12.10.13.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 10:13:34 -0700 (PDT) From: Christian Brauner To: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org, ebiederm@xmission.com, torvalds@linux-foundation.org Cc: Christian Brauner Subject: [PATCH 1/3 v3] devpts: hoist out check for DEVPTS_SUPER_MAGIC Date: Mon, 12 Mar 2018 18:13:28 +0100 Message-Id: <20180312171330.32054-2-christian.brauner@ubuntu.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180312171330.32054-1-christian.brauner@ubuntu.com> References: <20180312171330.32054-1-christian.brauner@ubuntu.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hoist the check whether we have already found a suitable devpts filesystem out of devpts_ptmx_path() in preparation for the devpts bind-mount resolution patch. This is a non-functional change. Signed-off-by: Christian Brauner --- ChangeLog v2->v3: * patch unchanged ChangeLog v1->v2: * patch added ChangeLog v0->v1: * patch not present --- fs/devpts/inode.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index e31d6ed3ec32..d3ddbb888874 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -138,10 +138,6 @@ static int devpts_ptmx_path(struct path *path) struct super_block *sb; int err; - /* Has the devpts filesystem already been found? */ - if (path->mnt->mnt_sb->s_magic == DEVPTS_SUPER_MAGIC) - return 0; - /* Is a devpts filesystem at "pts" in the same directory? */ err = path_pts(path); if (err) @@ -159,17 +155,22 @@ static int devpts_ptmx_path(struct path *path) struct vfsmount *devpts_mntget(struct file *filp, struct pts_fs_info *fsi) { struct path path; - int err; path = filp->f_path; path_get(&path); - err = devpts_ptmx_path(&path); - dput(path.dentry); - if (err) { - mntput(path.mnt); - return ERR_PTR(err); + /* Has the devpts filesystem already been found? */ + if (path.mnt->mnt_sb->s_magic != DEVPTS_SUPER_MAGIC) { + int err; + + err = devpts_ptmx_path(&path); + dput(path.dentry); + if (err) { + mntput(path.mnt); + return ERR_PTR(err); + } } + if (DEVPTS_SB(path.mnt->mnt_sb) != fsi) { mntput(path.mnt); return ERR_PTR(-ENODEV); @@ -182,15 +183,19 @@ struct pts_fs_info *devpts_acquire(struct file *filp) struct pts_fs_info *result; struct path path; struct super_block *sb; - int err; path = filp->f_path; path_get(&path); - err = devpts_ptmx_path(&path); - if (err) { - result = ERR_PTR(err); - goto out; + /* Has the devpts filesystem already been found? */ + if (path.mnt->mnt_sb->s_magic != DEVPTS_SUPER_MAGIC) { + int err; + + err = devpts_ptmx_path(&path); + if (err) { + result = ERR_PTR(err); + goto out; + } } /* -- 2.15.1