From mboxrd@z Thu Jan 1 00:00:00 1970 From: NeilBrown Subject: [PATCH 01/10] ovl: small optimisation for ovl_lookup Date: Mon, 06 Sep 2010 10:50:28 +1000 Message-ID: <20100906005028.20775.47191.stgit@localhost.localdomain> References: <20100906004829.20775.68828.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: Miklos Szeredi Return-path: In-Reply-To: <20100906004829.20775.68828.stgit@localhost.localdomain> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org If we find a non-directory in the upper layer, there is no point performing a lookup in the lower layer as whatever is found will just be ignored anyway. Signed-off-by: NeilBrown --- fs/overlayfs/overlayfs.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/fs/overlayfs/overlayfs.c b/fs/overlayfs/overlayfs.c index 0fe3944..0ddfeec 100644 --- a/fs/overlayfs/overlayfs.c +++ b/fs/overlayfs/overlayfs.c @@ -495,7 +495,8 @@ static struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, dput(upperdentry); upperdentry = NULL; ue->opaque = true; - } + } else if (!S_ISDIR(upperdentry->d_inode->i_mode)) + ue->opaque = true; revert_creds(old_cred); put_cred(override_cred); } @@ -507,14 +508,12 @@ static struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, dput(upperdentry); goto out_free; } - } - - if (lowerdentry && upperdentry && - (!S_ISDIR(upperdentry->d_inode->i_mode) || - !S_ISDIR(lowerdentry->d_inode->i_mode))) { - dput(lowerdentry); - lowerdentry = NULL; - ue->opaque = true; + if (lowerdentry && upperdentry && + !S_ISDIR(lowerdentry->d_inode->i_mode)) { + dput(lowerdentry); + lowerdentry = NULL; + ue->opaque = true; + } } if (lowerdentry || upperdentry) {