Revision: 868
http://svn.sourceforge.net/hackndev/?rev=868&view=rev
Author: z72ka
Date: 2007-02-22 06:10:45 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
Unionfs for 2.6.20
Modified Paths:
--------------
linux4palm/linux/trunk/fs/Kconfig
linux4palm/linux/trunk/fs/namei.c
Modified: linux4palm/linux/trunk/fs/Kconfig
===================================================================
--- linux4palm/linux/trunk/fs/Kconfig 2007-02-22 14:00:29 UTC (rev 867)
+++ linux4palm/linux/trunk/fs/Kconfig 2007-02-22 14:10:45 UTC (rev 868)
@@ -1619,15 +1619,24 @@
written to the system log.
config UNION_FS
- tristate "Union fs support"
+ tristate "Union file system (EXPERIMENTAL)"
depends on EXPERIMENTAL
help
- Unionfs is a stackable unification file system, which can
- appear to merge the contents of several directories (branches),
- while keeping their physical content separate.
+ Unionfs is a stackable unification file system, which appears to
+ merge the contents of several directories (branches), while keeping
+ their physical content separate.
- see <http://www.fsl.cs.sunysb.edu/project-unionfs.html> for details
+ See <http://unionfs.filesystems.org/> for details
+config UNION_FS_XATTR
+ bool "Unionfs extended attributes"
+ depends on UNION_FS
+ help
+ Extended attributes are name:value pairs associated with inodes by
+ the kernel or by users (see the attr(5) manual page).
+
+ If unsure, say N.
+
endmenu
menu "Network File Systems"
Modified: linux4palm/linux/trunk/fs/namei.c
===================================================================
--- linux4palm/linux/trunk/fs/namei.c 2007-02-22 14:00:29 UTC (rev 867)
+++ linux4palm/linux/trunk/fs/namei.c 2007-02-22 14:10:45 UTC (rev 868)
@@ -1292,8 +1292,8 @@
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;
@@ -1313,7 +1313,7 @@
}
this.hash = end_name_hash(hash);
- return __lookup_hash(&this, base, NULL);
+ return __lookup_hash(&this, base, nd);
access:
return ERR_PTR(-EACCES);
}
@@ -2757,7 +2757,7 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
