From: Jan Blunck <jblunck@suse.de>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: viro@zeniv.linux.org.uk, bharata@in.ibm.com, dwmw2@infradead.org,
mszeredi@suse.cz, vaurora@redhat.com
Subject: [PATCH 23/32] union-mount: stop lookup when finding a whiteout
Date: Mon, 18 May 2009 18:09:19 +0200 [thread overview]
Message-ID: <1242662968-11684-24-git-send-email-jblunck@suse.de> (raw)
In-Reply-To: <1242662968-11684-1-git-send-email-jblunck@suse.de>
Stop the lookup if we find a whiteout during union path lookup.
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Valerie Aurora (Henson) <vaurora@redhat.com>
---
fs/namei.c | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 83cc5ea..9c38df3 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -440,10 +440,10 @@ static int __cache_lookup_topmost(struct nameidata *nd, struct qstr *name,
path->dentry = dentry;
path->mnt = dentry ? nd->path.mnt : NULL;
- if (!dentry || dentry->d_inode)
+ if (!dentry || (dentry->d_inode || d_is_whiteout(dentry)))
return !dentry;
- /* look for the first non-negative dentry */
+ /* look for the first non-negative or whiteout dentry */
while (follow_union_down(&nd->path.mnt, &nd->path.dentry)) {
dentry = d_hash_and_lookup(nd->path.dentry, name);
@@ -465,7 +465,7 @@ static int __cache_lookup_topmost(struct nameidata *nd, struct qstr *name,
goto out_dput;
}
- if (dentry->d_inode)
+ if (dentry->d_inode || d_is_whiteout(dentry))
goto out_dput;
dput(dentry);
@@ -503,6 +503,11 @@ static int __cache_lookup_build_union(struct nameidata *nd, struct qstr *name,
return 1;
}
+ if (d_is_whiteout(dentry)) {
+ dput(dentry);
+ break;
+ }
+
if (!dentry->d_inode) {
dput(dentry);
continue;
@@ -714,7 +719,6 @@ out_unlock:
* type mismatch and whiteouts.
*
* FIXME:
- * - handle DT_WHT
* - handle union stacks in use
* - handle union stacks mounted upon union stacks
* - avoid unnecessary allocations of union locks
@@ -729,7 +733,7 @@ static int __real_lookup_topmost(struct nameidata *nd, struct qstr *name,
if (err)
return err;
- if (path->dentry->d_inode)
+ if (path->dentry->d_inode || d_is_whiteout(path->dentry))
return 0;
while (follow_union_down(&nd->path.mnt, &nd->path.dentry)) {
@@ -745,7 +749,7 @@ static int __real_lookup_topmost(struct nameidata *nd, struct qstr *name,
if (err)
goto out;
- if (next.dentry->d_inode) {
+ if (next.dentry->d_inode || d_is_whiteout(next.dentry)) {
dput(path->dentry);
mntget(next.mnt);
*path = next;
@@ -788,6 +792,11 @@ static int __real_lookup_build_union(struct nameidata *nd, struct qstr *name,
if (err)
goto out;
+ if (d_is_whiteout(next.dentry)) {
+ dput(next.dentry);
+ break;
+ }
+
if (!next.dentry->d_inode) {
dput(next.dentry);
continue;
@@ -1577,7 +1586,7 @@ static int __hash_lookup_topmost(struct nameidata *nd, struct qstr *name,
if (err)
return err;
- if (path->dentry->d_inode)
+ if (path->dentry->d_inode || d_is_whiteout(path->dentry))
return 0;
while (follow_union_down(&nd->path.mnt, &nd->path.dentry)) {
@@ -1595,7 +1604,7 @@ static int __hash_lookup_topmost(struct nameidata *nd, struct qstr *name,
if (err)
goto out;
- if (next.dentry->d_inode) {
+ if (next.dentry->d_inode || d_is_whiteout(next.dentry)) {
dput(path->dentry);
mntget(next.mnt);
*path = next;
@@ -1633,6 +1642,11 @@ static int __hash_lookup_build_union(struct nameidata *nd, struct qstr *name,
if (err)
goto out;
+ if (d_is_whiteout(next.dentry)) {
+ dput(next.dentry);
+ break;
+ }
+
if (!next.dentry->d_inode) {
dput(next.dentry);
continue;
--
1.6.1.3
next prev parent reply other threads:[~2009-05-18 16:09 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-18 16:08 [PATCH 00/32] VFS based Union Mount (V3) Jan Blunck
2009-05-18 16:08 ` [PATCH 01/32] atomic: Only take lock when the counter drops to zero on UP as well Jan Blunck
2009-05-18 16:08 ` [PATCH 02/32] VFS: BUG() if somebody tries to rehash an already hashed dentry Jan Blunck
2009-05-18 16:08 ` [PATCH 03/32] VFS: propagate mnt_flags into do_loopback Jan Blunck
2009-05-18 16:09 ` [PATCH 04/32] VFS: Make lookup_hash() return a struct path Jan Blunck
2009-05-18 16:09 ` [PATCH 05/32] VFS: Remove unnecessary micro-optimization in cached_lookup() Jan Blunck
2009-05-18 16:09 ` [PATCH 06/32] VFS: Make real_lookup() return a struct path Jan Blunck
2009-05-18 16:09 ` [PATCH 07/32] VFS: Introduce dput() variant that maintains a kill-list Jan Blunck
2009-05-18 16:09 ` [PATCH 08/32] whiteout: Don't return information about whiteouts to userspace Jan Blunck
2009-05-18 16:09 ` [PATCH 09/32] whiteout: Add vfs_whiteout() and whiteout inode operation Jan Blunck
2009-05-18 16:09 ` [PATCH 10/32] whiteout: Set S_OPAQUE inode flag when creating directories Jan Blunck
2009-05-18 16:09 ` [PATCH 11/32] whiteout: Add whiteout support to tmpfs Jan Blunck
2009-05-18 16:09 ` [PATCH 12/32] whiteout: Split of ext2_append_link() from ext2_add_link() Jan Blunck
2009-05-18 16:09 ` [PATCH 13/32] whiteout: Add whiteout support to ext2 Jan Blunck
2009-05-18 16:09 ` [PATCH 14/32] whiteout: Add path_whiteout() helper Jan Blunck
2009-05-18 16:09 ` [PATCH 15/32] union-mount: Documentation Jan Blunck
2009-05-25 6:25 ` hooanon05
2009-05-25 8:03 ` Arnd Bergmann
2009-05-25 8:43 ` hooanon05
2009-06-18 19:05 ` Valerie Aurora
2009-06-19 1:53 ` hooanon05
2009-05-18 16:09 ` [PATCH 16/32] union-mount: Introduce MNT_UNION and MS_UNION flags Jan Blunck
2009-05-18 16:09 ` [PATCH 17/32] union-mount: Introduce union_mount structure Jan Blunck
2009-05-18 16:09 ` [PATCH 18/32] union-mount: Drive the union cache via dcache Jan Blunck
2009-05-18 16:09 ` [PATCH 19/32] union-mount: Some checks during namespace changes Jan Blunck
2009-05-18 16:09 ` [PATCH 20/32] union-mount: Changes to the namespace handling Jan Blunck
2009-05-18 16:09 ` [PATCH 21/32] union-mount: Make lookup work for union-mounted file systems Jan Blunck
2009-05-19 16:15 ` Miklos Szeredi
2009-05-19 17:30 ` Valerie Aurora
2009-05-20 10:21 ` Miklos Szeredi
2009-05-18 16:09 ` [PATCH 22/32] union-mount: stop lookup when directory has S_OPAQUE flag set Jan Blunck
2009-05-18 16:09 ` Jan Blunck [this message]
2009-05-18 16:09 ` [PATCH 24/32] union-mount: in-kernel file copy between union mounted filesystems Jan Blunck
2009-05-18 16:09 ` [PATCH 25/32] union-mount: check for logically empty directory (FIXME) Jan Blunck
2009-05-18 16:09 ` [PATCH 26/32] union-mount: call do_whiteout() on unlink and rmdir Jan Blunck
2009-05-18 16:09 ` [PATCH 27/32] union-mount: Always create topmost directory on open Jan Blunck
2009-05-18 16:09 ` [PATCH 28/32] union-mount: Basic fallthru definitions Jan Blunck
2009-05-18 16:09 ` [PATCH 29/32] union mount: Support for fallthru entries in union mount lookup Jan Blunck
2009-05-18 16:09 ` [PATCH 30/32] union mount: ext2 fallthru support Jan Blunck
2009-05-18 16:32 ` Andreas Dilger
2009-05-19 9:42 ` Jan Blunck
2009-05-19 14:05 ` Andreas Dilger
2009-05-19 16:13 ` Jan Blunck
2009-05-18 16:09 ` [PATCH 31/32] union-mount: tmpfs " Jan Blunck
2009-05-18 16:09 ` [PATCH 32/32] union-mount: Copy up directory entries on first readdir() Jan Blunck
2009-05-18 20:40 ` [PATCH] Userland for VFS based Union Mount (V3) Valerie Aurora
2009-05-21 13:53 ` Andreas Dilger
2009-06-18 3:22 ` Valerie Aurora
2009-05-19 9:48 ` [PATCH 00/32] " Miklos Szeredi
2009-05-19 10:29 ` Jan Blunck
2009-05-19 10:35 ` Miklos Szeredi
2009-05-19 10:39 ` Jan Blunck
2009-05-19 11:54 ` Arnd Bergmann
2009-05-19 12:15 ` Jan Blunck
2009-05-19 12:21 ` Arnd Bergmann
2009-05-19 13:10 ` Jan Blunck
2009-05-19 17:23 ` Valerie Aurora
2009-05-20 9:05 ` Miklos Szeredi
2009-06-08 19:44 ` Valerie Aurora
2009-06-16 15:19 ` Miklos Szeredi
2009-05-21 12:54 ` Jan Rekorajski
2009-06-08 19:57 ` Valerie Aurora
2009-06-08 22:44 ` Jan Rekorajski
2009-06-08 22:48 ` Valerie Aurora
2009-06-15 9:55 ` Jan Rekorajski
2009-06-18 3:23 ` Valerie Aurora
2009-06-04 11:38 ` Scott James Remnant
2009-06-09 22:15 ` Valerie Aurora
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1242662968-11684-24-git-send-email-jblunck@suse.de \
--to=jblunck@suse.de \
--cc=bharata@in.ibm.com \
--cc=dwmw2@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mszeredi@suse.cz \
--cc=vaurora@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).