From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 52/74] union-mount: Call union lookup functions in lookup path Date: Tue, 22 Mar 2011 19:04:43 -0700 Message-ID: <1300845905-14433-9-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-gw0-f46.google.com ([74.125.83.46]:58106 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751707Ab1CWCFl (ORCPT ); Tue, 22 Mar 2011 22:05:41 -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 Union mounts hook into the lookup path in two places: do_lookup() and lookup_hash(). Signed-off-by: Valerie Aurora --- fs/namei.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 3fcb42c..531a0e0 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -995,6 +995,11 @@ done: path->mnt = mnt; path->dentry = dentry; __follow_mount(path); + if (needs_lookup_union(&nd->path, path)) { + int err = do_lookup_union(nd, name, path); + if (err < 0) + return err; + } return 0; need_lookup: @@ -1417,8 +1422,13 @@ static int lookup_hash(struct nameidata *nd, struct qstr *name, err = PTR_ERR(path->dentry); path->dentry = NULL; path->mnt = NULL; + return err; } + + if (needs_lookup_union(&nd->path, path)) + err = lookup_union(nd, name, path); return err; + } static int __lookup_one_len(const char *name, struct qstr *this, -- 1.7.0.4