From patchwork Wed Apr 26 21:35:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9702093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE33F603F4 for ; Wed, 26 Apr 2017 21:35:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC144285E7 for ; Wed, 26 Apr 2017 21:35:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE8D5285EF; Wed, 26 Apr 2017 21:35:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60127285E7 for ; Wed, 26 Apr 2017 21:35:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754414AbdDZVfY (ORCPT ); Wed, 26 Apr 2017 17:35:24 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:32882 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030849AbdDZVfS (ORCPT ); Wed, 26 Apr 2017 17:35:18 -0400 Received: by mail-wr0-f193.google.com with SMTP id w50so1681789wrc.0; Wed, 26 Apr 2017 14:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3ItHupfhKcerxoVpUXTelHjN0dmEhH698dJLyhHdAJs=; b=Zt/Qbhiq3BohGXHs3R7SCHQTTYdBfwCo4Jz4i4XjLKL1syJXxHWeVwdvjT7qxH0v4y XzfgNaNnHDJfpSc5qBNyJKOIW3N/VnUPK6QvqAfIdUjhs/i4AxEXGl0/kPxbT7Gdrb6F KHGXnsA9vMjtMjgTBYRKfPSW0qzIdrbNvwQHgI1jcevq2Wo+O3EetHGDe/EaGMJpm8sv EtXgwYpZU1/EMmwbLDyiR7JBrmqd2VC+q3q5kfkaozorUgkISnMwyAs981IX+wz/bpF2 sVAV6qbGu8qghQTiqM+Ovlayxd0NnJPF+QJ8cJpxDANhOw6qpGIruA6fhjAAx813zcnf irBw== 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=3ItHupfhKcerxoVpUXTelHjN0dmEhH698dJLyhHdAJs=; b=Msbioy/aNWBAC2gqL7/qGeBJHfNGgGw2/GBJvpVIf+unh/wDjJraznoowtpXJ//ec0 czwihyn12U5VIhekSPtivXspRaXLHWzp7N1tGlBDbNWLHUMekccffj7IEUKYZCTazJHD yv8GfmeGx5aLTKtCPp5QUFnfYH+Kzo5VlA6x/cTHAAcTgSEDLk4XqPBek6tts3YCdri0 0uBxqu60GohK1Tpkj3PAEZDpV3cKuNyCSh//ADXdYaOq8P37e+1oep8ZlbkfXWmKb9WN 5F/HrYLq5TLodvWmkK/8fNJTWVNSDFmS/8IgWW0Y6yZQHZvvPHzzMINtbtTa4oujoasl rlhA== X-Gm-Message-State: AN3rC/5KFMbM8ShdKsmsB/zFJw1ZNveM2ur0/03bEQLVXTM717FUrPyn FfuCJdzWJqjQmA== X-Received: by 10.223.172.105 with SMTP id v96mr1347783wrc.1.1493242516811; Wed, 26 Apr 2017 14:35:16 -0700 (PDT) Received: from amir-VirtualBox.lan (bzq-79-179-55-127.red.bezeqint.net. [79.179.55.127]) by smtp.gmail.com with ESMTPSA id 81sm931577wmj.9.2017.04.26.14.35.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Apr 2017 14:35:16 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Vivek Goyal , Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 05/16] ovl: use an auxiliary var for overlay root entry Date: Thu, 27 Apr 2017 00:35:07 +0300 Message-Id: <1493242518-15266-6-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493242518-15266-1-git-send-email-amir73il@gmail.com> References: <1493242518-15266-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Amir Goldstein --- fs/overlayfs/namei.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index d660177..17f9372 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -220,6 +220,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, const struct cred *old_cred; struct ovl_fs *ofs = dentry->d_sb->s_fs_info; struct ovl_entry *poe = dentry->d_parent->d_fsdata; + struct ovl_entry *roe = dentry->d_sb->s_root->d_fsdata; struct path *stack = NULL; struct dentry *upperdir, *upperdentry = NULL; unsigned int ctr = 0; @@ -259,7 +260,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, if (!upperredirect) goto out_put_upper; if (d.redirect[0] == '/') - poe = dentry->d_sb->s_root->d_fsdata; + poe = roe; } if (d.opaque) type |= __OVL_PATH_OPAQUE; @@ -291,10 +292,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, if (d.stop) break; - if (d.redirect && - d.redirect[0] == '/' && - poe != dentry->d_sb->s_root->d_fsdata) { - poe = dentry->d_sb->s_root->d_fsdata; + if (d.redirect && d.redirect[0] == '/' && poe != roe) { + poe = roe; /* Find the current layer on the root dentry */ for (i = 0; i < poe->numlower; i++)