commit 3a4d337f5107f6fe3289ec33ca314f4d720275c8
Author: Erez_Zadok <[EMAIL PROTECTED]>
Date: Sat Nov 17 21:22:54 2007 -0500
Unionfs: pass nameidata intent information to lower level file systems
As of 2.6.23-rc1, nfs2 and nfs3, like nfs4 before them, begin relying on the
struct nameidata and especially the intent information, which is passed to
vfs_create() and others. So, as of now, unionfs properly creates and passes
that intent data to the lower level file system. Currently supported are
LOOKUP_CREATE open intents. Others can be supported in the future
incrementally.
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index c8e6e2d..094bad4 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -177,19 +177,26 @@ static int __copyup_ndentry(struct dentry
*old_lower_dentry,
run_sioq(__unionfs_mknod, &args);
err = args.err;
} else if (S_ISREG(old_mode)) {
+ struct nameidata *nd = alloc_lower_nd(LOOKUP_CREATE);
+ if (!nd) {
+ err = -ENOMEM;
+ goto out;
+ }
+ args.create.nd = nd;
args.create.parent = new_lower_parent_dentry->d_inode;
args.create.dentry = new_lower_dentry;
args.create.mode = old_mode;
- args.create.nd = NULL;
run_sioq(__unionfs_create, &args);
err = args.err;
+ free_lower_nd(nd, err);
} else {
printk(KERN_ERR "unionfs: unknown inode type %d\n",
old_mode);
BUG();
}
+out:
return err;
}
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 36f6bc0..45ac976 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -524,3 +524,65 @@ void update_bstart(struct dentry *dentry)
unionfs_set_lower_dentry_idx(dentry, bindex, NULL);
}
}
+
+
+/*
+ * Allocate and fill in a nameidata structure (the intent part) we can pass
+ * to a lower file system. Returns NULL on error (only -ENOMEM possible),
+ * or a valid allocated nameidata structure. Inside that structure, this
+ * function may also return an allocated struct file (for open intents).
+ * The caller, when done with this nd, must kfree both the intent file and
+ * the entire nd.
+ */
+struct nameidata *alloc_lower_nd(unsigned int flags)
+{
+ struct nameidata *nd;
+#ifdef ALLOC_LOWER_ND_FILE
+ /*
+ * XXX: one day we may need to have the lower return an open file
+ * for us. It is not needed in 2.6.23-rc1 for nfs2/nfs3, but may
+ * very well be needed for nfs4.
+ */
+ struct file *file;
+#endif /* ALLOC_LOWER_ND_FILE */
+
+ nd = kzalloc(sizeof(struct nameidata), GFP_KERNEL);
+ if (!nd)
+ goto out;
+
+ switch (flags) {
+ case LOOKUP_CREATE:
+ nd->flags = LOOKUP_CREATE;
+ nd->intent.open.flags = FMODE_READ | FMODE_WRITE | O_CREAT;
+#ifdef ALLOC_LOWER_ND_FILE
+ file = kzalloc(sizeof(struct file), GFP_KERNEL);
+ if (!file) {
+ kfree(nd);
+ nd = NULL;
+ goto out;
+ }
+ nd->intent.open.file = file;
+#endif /* ALLOC_LOWER_ND_FILE */
+ break;
+ default:
+ /*
+ * We should never get here, for now.
+ * We can add new cases here later on.
+ */
+ BUG();
+ break;
+ }
+out:
+ return nd;
+}
+
+void free_lower_nd(struct nameidata *nd, int err)
+{
+ if (nd->intent.open.file) {
+ if (!err)
+ fput(nd->intent.open.file); /* XXX: open file not
needed? */
+ kfree(nd->intent.open.file);
+ }
+ kfree(nd);
+}
+
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 0121a95..e75b5d9 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -228,6 +228,7 @@ static int do_unionfs_rename(struct inode *old_dir,
if (err)
goto revert;
}
+ free_lower_nd(nd, local_err);
}
else if (err && old_bstart == 0) {
if (bindex == 0)
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index dfd3931..bd7714c 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -266,6 +266,8 @@ static inline void unionfs_double_lock_dentry(struct dentry
*d1,
extern int new_dentry_private_data(struct dentry *dentry);
extern void free_dentry_private_data(struct dentry *dentry);
extern void update_bstart(struct dentry *dentry);
+extern struct nameidata *alloc_lower_nd(unsigned int flags);
+extern void free_lower_nd(struct nameidata *nd, int err);
/*
* EXTERNALS:
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
