From: Valerie Aurora <vaurora@xxxxxxxxxx>
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 <valerie.aurora@xxxxxxxxx>
---
fs/namei.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 3532ea9..4170f92 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -817,8 +817,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.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
