From: Valerie Aurora <vaurora@xxxxxxxxxx>
Whiteouts end a union lookup. So do opaque directories, unless
specific fallthru entry exists for this name.
Signed-off-by: Valerie Aurora <valerie.aurora@xxxxxxxxx>
---
fs/namei.c | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 2f7354e..5c62042 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -787,11 +787,32 @@ static int __lookup_union(struct nameidata *nd, struct qstr *name,
err = PTR_ERR(lower.dentry);
goto out_err;
}
- /* XXX - do nothing, lookup rule processing in later patches */
+
+ /*
+ * A negative dentry can mean several things. A plain
+ * negative dentry is ignored and lookup continues to
+ * the next layer. But a whiteout or a non-fallthru
+ * in an opaque dir covers everything below it.
+ */
+ if (!lower.dentry->d_inode) {
+ if (d_is_whiteout(lower.dentry))
+ goto out_lookup_done;
+ if (IS_OPAQUE(nd->path.dentry->d_inode) &&
+ !d_is_fallthru(lower.dentry))
+ goto out_lookup_done;
+ path_put(&lower);
+ continue;
+ }
+
+ /* XXX - do nothing, more in later patches */
path_put(&lower);
}
return 0;
+out_lookup_done:
+ path_put(&lower);
+ return 0;
+
out_err:
d_free_unions(topmost->dentry);
path_put(&lower);
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
