From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 47/74] union-mount: Return files found in lower layers in __lookup_union() Date: Tue, 22 Mar 2011 19:04:38 -0700 Message-ID: <1300845905-14433-4-git-send-email-valerie.aurora@gmail.com> References: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com> Cc: viro@zeniv.linux.org.uk, Valerie Aurora , Valerie Aurora To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org Return-path: Received: from mail-gx0-f174.google.com ([209.85.161.174]:36136 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751707Ab1CWCFa (ORCPT ); Tue, 22 Mar 2011 22:05:30 -0400 In-Reply-To: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Valerie Aurora If we find a file during union lookup, don't look in any lower layers and replace the topmost path with the file's path. Signed-off-by: Valerie Aurora --- fs/namei.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 5c62042..3532ea9 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -804,11 +804,34 @@ static int __lookup_union(struct nameidata *nd, struct qstr *name, continue; } + /* + * Files block everything below them. Special case: + * If we find a file below a directory (which makes no + * sense), just ignore the file and return the + * directory above it. + */ + if (!S_ISDIR(lower.dentry->d_inode->i_mode)) { + if (topmost->dentry->d_inode && + S_ISDIR(topmost->dentry->d_inode->i_mode)) + goto out_lookup_done; + goto out_found_file; + } + /* XXX - do nothing, more in later patches */ path_put(&lower); } return 0; +out_found_file: + /* + * Swap out the positive lower dentry with the negative upper + * dentry for this file. Note that the matching mntput() is done + * in link_path_walk(). + */ + dput(topmost->dentry); + *topmost = lower; + return 0; + out_lookup_done: path_put(&lower); return 0; -- 1.7.0.4