lkml.org 
[lkml]   [2010]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 30/34] union-mount: Build union stack in __lookup_union()
Date
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 <vaurora@redhat.com>
---
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


\
 
 \ /
  Last update: 2010-09-17 00:19    [from the cache]
©2003-2011 Jasper Spaans