head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.24.06.14.17;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.24.06.14.17;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.11.07.06.13.33;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.12.11.14.23.59;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.12.31.22.29.19;	author jsipek;	state Exp;
branches;
next	;


desc
@@


1.1
log
@file lookup-one-len-changes was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Move unionfs specific bits into a subdir
@
text
@a0 64
lookup_one_len_nd - lookup_one_len with nameidata argument

From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

This patch renames 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@@cs.sunysb.edu>

diff -r 06b12f84284e fs/namei.c
--- a/fs/namei.c	Sat Oct 07 19:08:19 2006 -0400
+++ b/fs/namei.c	Mon Oct 09 16:22:59 2006 -0400
@@@@ -1295,8 +1295,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;
@@@@ -1316,7 +1316,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(get_write_access); /* binf
 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 -r 06b12f84284e include/linux/namei.h
--- a/include/linux/namei.h	Sat Oct 07 19:08:19 2006 -0400
+++ b/include/linux/namei.h	Mon Oct 09 16:16:08 2006 -0400
@@@@ -76,7 +76,15 @@@@ extern struct file *nameidata_to_filp(st
 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 **);
@


1.1.2.2
log
@Git generates slightly different diffs - same information, just little
different
@
text
@d13 4
a16 5
diff --git a/fs/namei.c b/fs/namei.c
index 95fb66c..2835647 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@@@ -1290,8 +1290,8 @@@@ static struct dentry *lookup_hash(struct
d27 1
a27 1
@@@@ -1311,7 +1311,7 @@@@ struct dentry * lookup_one_len(const cha
d36 1
a36 1
@@@@ -2756,7 +2756,7 @@@@ EXPORT_SYMBOL(follow_up);
d45 4
a48 5
diff --git a/include/linux/namei.h b/include/linux/namei.h
index d39a5a6..8551806 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@@@ -81,7 +81,15 @@@@ extern struct file *lookup_instantiate_f
@


1.1.2.3
log
@Folded unionfs-lkml-comments-jan
@
text
@d15 2
a16 4

diff -r 0220b538b093 fs/namei.c
--- a/fs/namei.c	Mon Dec 11 08:59:29 2006 -0500
+++ b/fs/namei.c	Mon Dec 11 08:59:59 2006 -0500
d23 1
a23 1
+struct dentry *lookup_one_len_nd(const char *name, struct dentry *base,
d37 1
a37 1
@@@@ -2756,7 +2756,7 @@@@ EXPORT_SYMBOL(get_write_access); /* binf
d46 5
a50 4
diff -r 0220b538b093 include/linux/namei.h
--- a/include/linux/namei.h	Mon Dec 11 08:59:29 2006 -0500
+++ b/include/linux/namei.h	Mon Dec 11 09:00:38 2006 -0500
@@@@ -81,7 +81,15 @@@@ extern struct file *nameidata_to_filp(st
d55 1
a55 1
+extern struct dentry *lookup_one_len_nd(const char *,
@


1.1.2.4
log
@Small cleanup
@
text
@d13 3
@


