[PVFS2-CVS] commit by robl in pvfs2-1/src/kernel/linux-2.6: pvfs2-kernel.h xattr.c

CVS commit program cvs at parl.clemson.edu
Wed Sep 28 19:05:51 EDT 2005


Update of /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6
In directory parlweb:/tmp/cvs-serv690/src/kernel/linux-2.6

Modified Files:
	pvfs2-kernel.h xattr.c 
Log Message:
phil's patch to fix the prototype for the xattr routines on 2.4 kernels


Index: pvfs2-kernel.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/pvfs2-kernel.h,v
diff -u -w -p -u -r1.92 -r1.93
--- pvfs2-kernel.h	15 Aug 2005 21:16:25 -0000	1.92
+++ pvfs2-kernel.h	28 Sep 2005 22:05:50 -0000	1.93
@@ -372,8 +372,13 @@ int pvfs2_getattr(
 /****************************
  * defined in xattr.c
  ****************************/
+#ifdef PVFS2_LINUX_KERNEL_2_4
+int pvfs2_setxattr(struct dentry *dentry, const char *name,
+		void *value, size_t size, int flags);
+#else
 int pvfs2_setxattr(struct dentry *dentry, const char *name,
 		const void *value, size_t size, int flags);
+#endif
 ssize_t pvfs2_getxattr(struct dentry *dentry, const char *name,
 		         void *buffer, size_t size);
 ssize_t pvfs2_listxattr(struct dentry *dentry, char *buffer, size_t size);

Index: xattr.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/xattr.c,v
diff -u -w -p -u -r1.3 -r1.4
--- xattr.c	19 Aug 2005 16:44:29 -0000	1.3
+++ xattr.c	28 Sep 2005 22:05:50 -0000	1.4
@@ -17,8 +17,13 @@
 #include <linux/xattr.h>
 
 /* All pointers are in kernel-space */
+#ifdef PVFS2_LINUX_KERNEL_2_4
+int pvfs2_setxattr(struct dentry *dentry, const char *name,
+		void *value, size_t size, int flags)
+#else
 int pvfs2_setxattr(struct dentry *dentry, const char *name,
 		const void *value, size_t size, int flags)
+#endif
 {
     struct inode *inode = dentry->d_inode;
     int internal_flag = 0;



More information about the PVFS2-CVS mailing list