From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 30/34] union-mount: Build union stack in __lookup_union() Date: Thu, 16 Sep 2010 15:12:21 -0700 Message-ID: <1284675145-4391-31-git-send-email-vaurora@redhat.com> References: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Cc: Miklos Szeredi , Christoph Hellwig , Andreas Gruenbacher , Nick Piggin , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Valerie Aurora To: Alexander Viro Return-path: Received: from mx1.redhat.com ([209.132.183.28]:36960 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756483Ab0IPWPW (ORCPT ); Thu, 16 Sep 2010 18:15:22 -0400 In-Reply-To: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Build the union stack for directories as we look them up. Create the topmost directory if it doesn't exist. Signed-off-by: Valerie Aurora --- fs/namei.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index c6696d8..0041334 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -811,8 +811,22 @@ static int __lookup_union(struct nameidata *nd, struct qstr *name, goto out_found_file; } - /* XXX - do nothing, more in later patches */ - path_put(&lower); + /* + * Now we know the target is a directory. Create a + * matching topmost directory if one doesn't already + * exist, and add this layer's directory to the union + * stack for the topmost directory. + */ + if (!topmost->dentry->d_inode) { + err = union_create_topmost_dir(&parent, name, topmost, + &lower); + if (err) + goto out_err; + } + + err = union_add_dir(topmost, &lower, i); + if (err) + goto out_err; } return 0; -- 1.6.3.3