[Hackndev-commit] SF.net SVN: hackndev: [867] linux4palm/linux/trunk/include/linux

[<z7...@us...>]

Revision: 867
          http://svn.sourceforge.net/hackndev/?rev=867&view=rev
Author:   z72ka
Date:     2007-02-22 06:00:29 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
Unionfs for 2.6.20

Modified Paths:
--------------
    linux4palm/linux/trunk/include/linux/magic.h
    linux4palm/linux/trunk/include/linux/namei.h

Modified: linux4palm/linux/trunk/include/linux/magic.h
===================================================================
--- linux4palm/linux/trunk/include/linux/magic.h	2007-02-22 13:56:00 UTC (rev 866)
+++ linux4palm/linux/trunk/include/linux/magic.h	2007-02-22 14:00:29 UTC (rev 867)
@@ -33,6 +33,8 @@
 #define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
 #define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"
 
+#define UNIONFS_SUPER_MAGIC 0xf15f083d
+
 #define SMB_SUPER_MAGIC		0x517B
 #define USBDEVICE_SUPER_MAGIC	0x9fa2
 

Modified: linux4palm/linux/trunk/include/linux/namei.h
===================================================================
--- linux4palm/linux/trunk/include/linux/namei.h	2007-02-22 13:56:00 UTC (rev 866)
+++ linux4palm/linux/trunk/include/linux/namei.h	2007-02-22 14:00:29 UTC (rev 867)
@@ -81,8 +81,16 @@
 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 **);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.