The patch titled
lookup_one_len_nd - lookup_one_len with nameidata argument
has been added to the -mm tree. Its filename is
lookup_one_len_nd-lookup_one_len-with-nameidata-argument.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lookup_one_len_nd - lookup_one_len with nameidata argument
From: Josef "Jeff" Sipek <jsipek@xxxxxxxxxxxxx>
Rename lookup_one_len to lookup_one_len_nd, and adds a nameidata argument. An
inline function, lookup_one_len (which calls lookup_one_len_nd with nd ==
NULL) preserves original behavior.
The following Unionfs patches depend on this one.
Signed-off-by: Josef "Jeff" Sipek <jsipek@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/namei.c | 8 ++++----
include/linux/namei.h | 10 +++++++++-
2 files changed, 13 insertions(+), 5 deletions(-)
diff -puN fs/namei.c~lookup_one_len_nd-lookup_one_len-with-nameidata-argument fs/namei.c
--- a/fs/namei.c~lookup_one_len_nd-lookup_one_len-with-nameidata-argument
+++ a/fs/namei.c
@@ -1296,8 +1296,8 @@ static struct dentry *lookup_hash(struct
return __lookup_hash(&nd->last, nd->dentry, nd);
}
-/* SMP-safe */
-struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
+struct dentry *lookup_one_len_nd(const char *name, struct dentry *base,
+ int len, struct nameidata *nd)
{
unsigned long hash;
struct qstr this;
@@ -1317,7 +1317,7 @@ struct dentry * lookup_one_len(const cha
}
this.hash = end_name_hash(hash);
- return __lookup_hash(&this, base, NULL);
+ return __lookup_hash(&this, base, nd);
access:
return ERR_PTR(-EACCES);
}
@@ -2761,7 +2761,7 @@ EXPORT_SYMBOL(follow_up);
EXPORT_SYMBOL(get_write_access); /* binfmt_aout */
EXPORT_SYMBOL(getname);
EXPORT_SYMBOL(lock_rename);
-EXPORT_SYMBOL(lookup_one_len);
+EXPORT_SYMBOL(lookup_one_len_nd);
EXPORT_SYMBOL(page_follow_link_light);
EXPORT_SYMBOL(page_put_link);
EXPORT_SYMBOL(page_readlink);
diff -puN include/linux/namei.h~lookup_one_len_nd-lookup_one_len-with-nameidata-argument include/linux/namei.h
--- a/include/linux/namei.h~lookup_one_len_nd-lookup_one_len-with-nameidata-argument
+++ a/include/linux/namei.h
@@ -81,7 +81,15 @@ extern struct file *lookup_instantiate_f
extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
extern void release_open_intent(struct nameidata *);
-extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
+extern struct dentry *lookup_one_len_nd(const char *,
+ struct dentry *, int, struct nameidata *);
+
+/* SMP-safe */
+static inline struct dentry *lookup_one_len(const char *name,
+ struct dentry *dir, int len)
+{
+ return lookup_one_len_nd(name, dir, len, NULL);
+}
extern int follow_down(struct vfsmount **, struct dentry **);
extern int follow_up(struct vfsmount **, struct dentry **);
_
Patches currently in -mm which might be from jsipek@xxxxxxxxxxxxx are
unionfs-documentation.patch
lookup_one_len_nd-lookup_one_len-with-nameidata-argument.patch
unionfs-branch-management-functionality.patch
unionfs-common-file-operations.patch
unionfs-copyup-functionality.patch
unionfs-dentry-operations.patch
unionfs-file-operations.patch
unionfs-directory-file-operations.patch
unionfs-directory-manipulation-helper-functions.patch
unionfs-inode-operations.patch
unionfs-lookup-helper-functions.patch
unionfs-main-module-functions.patch
unionfs-readdir-state.patch
unionfs-rename.patch
unionfs-privileged-operations-workqueue.patch
unionfs-handling-of-stale-inodes.patch
unionfs-miscellaneous-helper-functions.patch
unionfs-superblock-operations.patch
unionfs-helper-macros-inlines.patch
unionfs-internal-include-file.patch
unionfs-include-file.patch
unionfs-unlink.patch
unionfs-kconfig-and-makefile.patch
unionfs-extended-attributes-support.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
