[ntfs-3g-cvs] ntfs-3g/include/fuse-lite fuse.h, 1.6.2.2, 1.6.2.3 fuse_kernel.h, 1.1.2.2, 1.1.2.3 fuse_common.h, 1.4.2.2, 1.4.2.3 fuse_lowlevel.h, 1.3.2.2, 1.3.2.3

[Jean-Pierre A. <jp...@us...>]

Update of /cvsroot/ntfs-3g/ntfs-3g/include/fuse-lite
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1880/ntfs-3g/include/fuse-lite

Modified Files:
      Tag: PERMISSION_HANDLING_BRANCH
	fuse.h fuse_kernel.h fuse_common.h fuse_lowlevel.h 
Log Message:
Inserted conditions on fuse patches to avoid constraints on older kernels


Index: fuse_lowlevel.h
===================================================================
RCS file: /cvsroot/ntfs-3g/ntfs-3g/include/fuse-lite/fuse_lowlevel.h,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- fuse_lowlevel.h	4 Jul 2009 19:14:56 -0000	1.3.2.2
+++ fuse_lowlevel.h	30 Jul 2009 13:11:50 -0000	1.3.2.3
@@ -101,8 +101,10 @@
 	/** Thread ID of the calling process */
 	pid_t pid;
 
+#ifdef POSIXACLS
 	/** Umask of the calling process (introduced in version 2.8) */
 	mode_t umask;
+#endif
 };
 
 /* 'to_set' flags in setattr */
@@ -923,6 +925,7 @@
  */
 int fuse_reply_buf(fuse_req_t req, const char *buf, size_t size);
 
+#ifdef POSIXACLS
 /**
  * Reply with data vector
  *
@@ -935,6 +938,7 @@
  * @return zero for success, -errno for failure to send reply
  */
 int fuse_reply_iov(fuse_req_t req, const struct iovec *iov, int count);
+#endif
 
 /**
  * Reply with filesystem statistics

Index: fuse_kernel.h
===================================================================
RCS file: /cvsroot/ntfs-3g/ntfs-3g/include/fuse-lite/fuse_kernel.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- fuse_kernel.h	4 Jul 2009 19:14:55 -0000	1.1.2.2
+++ fuse_kernel.h	30 Jul 2009 13:11:50 -0000	1.1.2.3
@@ -49,7 +49,11 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
+#ifdef POSIXACLS
 #define FUSE_KERNEL_MINOR_VERSION 12
+#else
+#define FUSE_KERNEL_MINOR_VERSION 8
+#endif
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -78,7 +82,9 @@
 	__u32	uid;
 	__u32	gid;
 	__u32	rdev;
-__u64 filling; /* JPA needed, but do not know how to fill */
+#ifdef POSIXACLS
+	__u64 filling; /* JPA needed, but do not know how to fill */
+#endif
 };
 
 struct fuse_kstatfs {
@@ -203,8 +209,10 @@
 struct fuse_mknod_in {
 	__u32	mode;
 	__u32	rdev;
+#ifdef POSIXACLS
 	__u32	umask;
 	__u32	padding;
+#endif
 };
 
 struct fuse_mkdir_in {
@@ -241,14 +249,20 @@
 
 struct fuse_open_in {
 	__u32	flags;
+#ifdef POSIXACLS
 	__u32	unused;
+#else
+	__u32	mode;
+#endif
 };
 
 struct fuse_create_in {
 	__u32	flags;
 	__u32	mode;
+#ifdef POSIXACLS
 	__u32	umask;
 	__u32	padding;
+#endif
 };
 
 struct fuse_open_out {
@@ -285,9 +299,11 @@
 	__u64	offset;
 	__u32	size;
 	__u32	write_flags;
+#ifdef POSIXACLS
 	__u64	lock_owner; /* JPA */
 	__u32	flags; /* JPA */
 	__u32	padding; /* JPA */
+#endif
 };
 
 struct fuse_write_out {

Index: fuse_common.h
===================================================================
RCS file: /cvsroot/ntfs-3g/ntfs-3g/include/fuse-lite/fuse_common.h,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- fuse_common.h	4 Jul 2009 19:14:55 -0000	1.4.2.2
+++ fuse_common.h	30 Jul 2009 13:11:50 -0000	1.4.2.3
@@ -23,7 +23,11 @@
 #define FUSE_MAJOR_VERSION 2
 
 /** Minor version of FUSE library interface */
+#ifdef POSIXACLS
 #define FUSE_MINOR_VERSION 8
+#else
+#define FUSE_MINOR_VERSION 7
+#endif
 
 #define FUSE_MAKE_VERSION(maj, min)  ((maj) * 10 + (min))
 #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)
@@ -32,11 +36,12 @@
 extern "C" {
 #endif
 
+#ifdef POSIXACLS
 /*
  * FUSE_CAP_DONT_MASK: don't apply umask to file mode on create operations
  */
 #define FUSE_CAP_DONT_MASK	(1 << 6)
-
+#endif
 
 /**
  * Information about open files
@@ -111,12 +116,19 @@
 	 */
 	unsigned max_readahead;
 
-	unsigned capable; /* JPA */
-	unsigned want; /* JPA */
+#ifdef POSIXACLS
+	unsigned capable;
+	unsigned want;
 	/**
 	 * For future use.
 	 */
-	unsigned reserved[25 /* was 27 JPA */];
+	unsigned reserved[25];
+#else
+	/**
+	 * For future use.
+	 */
+	unsigned reserved[27];
+#endif
     };
 
 struct fuse_session;

Index: fuse.h
===================================================================
RCS file: /cvsroot/ntfs-3g/ntfs-3g/include/fuse-lite/fuse.h,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- fuse.h	4 Jul 2009 19:14:55 -0000	1.6.2.2
+++ fuse.h	30 Jul 2009 13:11:50 -0000	1.6.2.3
@@ -442,8 +442,10 @@
 	/** Private filesystem data */
 	void *private_data;
 
+#ifdef POSIXACLS
 	/** Umask of the calling process (introduced in version 2.8) */
 	mode_t umask;
+#endif
 };
 
 /* ----------------------------------------------------------- *