From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Blunck Subject: [PATCH 27/32] union-mount: Always create topmost directory on open Date: Mon, 18 May 2009 18:09:23 +0200 Message-ID: <1242662968-11684-28-git-send-email-jblunck@suse.de> References: <1242662968-11684-1-git-send-email-jblunck@suse.de> Cc: viro@zeniv.linux.org.uk, bharata@in.ibm.com, dwmw2@infradead.org, mszeredi@suse.cz, vaurora@redhat.com To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Return-path: In-Reply-To: <1242662968-11684-1-git-send-email-jblunck@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Valerie Aurora (Henson) When we open a directory, unconditionally create a matching directory on the top-level. This way we don't have to go back and create all the directories on the path to an element when we want to copy it up. Signed-off-by: Jan Blunck Signed-off-by: Valerie Aurora (Henson) --- fs/namei.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 4d68597..684619c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1265,8 +1265,9 @@ static int __link_path_walk(const char *name, struct nameidata *nd) if (err) break; - if ((nd->flags & LOOKUP_TOPMOST) && - (nd->um_flags & LAST_LOWLEVEL)) { + if ((nd->um_flags & LAST_LOWLEVEL) && + (S_ISDIR(next.dentry->d_inode->i_mode) || + (nd->flags & LOOKUP_TOPMOST))) { struct dentry *dentry; dentry = union_create_topmost(nd, &this, &next); @@ -1330,8 +1331,9 @@ last_component: if (err) break; - if ((nd->flags & LOOKUP_TOPMOST) && - (nd->um_flags & LAST_LOWLEVEL)) { + if ((nd->um_flags & LAST_LOWLEVEL) && + (S_ISDIR(next.dentry->d_inode->i_mode) || + (nd->flags & LOOKUP_TOPMOST))) { struct dentry *dentry; dentry = union_create_topmost(nd, &this, &next); -- 1.6.1.3