Branch b1_6

b=13828
i=adilger,shadow

Don't use kernel's ATTR_* attributes over the network since the client and MDS
may run different kernels. Instead, use MDS_ATTR_* attributes (defined in
lustre_idl.h) for sa_valid.

diff --git a/lnet/include/libcfs/darwin/darwin-fs.h b/lnet/include/libcfs/darwin/darwin-fs.h
index 9091a24..da613ba 100644 (file)
--- a/lnet/include/libcfs/darwin/darwin-fs.h
+++ b/lnet/include/libcfs/darwin/darwin-fs.h
@@ -140,6 +140,8 @@ static inline void cfs_flock_set_end(cfs_flock_t *fl, loff_t end)
 #define ATTR_FROM_OPEN  0x1000  /* called from open path, ie O_TRUNC */
 #define ATTR_CTIME_SET  0x2000
 #define ATTR_BLOCKS     0x4000
+#define ATTR_KILL_SUID  0
+#define ATTR_KILL_SGID  0
 
 #define in_group_p(x)  (0)
 

diff --git a/lnet/include/libcfs/winnt/winnt-fs.h b/lnet/include/libcfs/winnt/winnt-fs.h
index 5be0458..088d0e0 100644 (file)
--- a/lnet/include/libcfs/winnt/winnt-fs.h
+++ b/lnet/include/libcfs/winnt/winnt-fs.h
@@ -131,6 +131,8 @@ typedef struct file_lock{
 #define ATTR_FROM_OPEN  0x1000  /* called from open path, ie O_TRUNC */
 //#define ATTR_CTIME_SET  0x2000
 #define ATTR_BLOCKS     0x4000
+#define ATTR_KILL_SUID  0
+#define ATTR_KILL_SGID  0
 
 #define in_group_p(x)  (0)