LU-540 remove file flags definition conflict between 1.8 and 2.x

There is file flags definition conflict between 1.8 "LL_FILE_LOCKED_DIRECTIO"
and 2.x "LL_FILE_RMTACL". Redefine the later one to erase such conflict.

Change-Id: I1f4b96382f865f8548bf1a54fb1c74d3649b0daf
Signed-off-by: nasf <yong.fan@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/1159
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h
index 0b42fa9..ccf703a 100644 (file)
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -166,10 +166,12 @@ struct obd_statfs {
 
 #define O_LOV_DELAY_CREATE 0100000000  /* hopefully this does not conflict */
 
 
 #define O_LOV_DELAY_CREATE 0100000000  /* hopefully this does not conflict */
 

-#define LL_FILE_IGNORE_LOCK             0x00000001
-#define LL_FILE_GROUP_LOCKED            0x00000002
-#define LL_FILE_READAHEAD               0x00000004
-#define LL_FILE_RMTACL                  0x00000008
+#define LL_FILE_IGNORE_LOCK     0x00000001
+#define LL_FILE_GROUP_LOCKED    0x00000002
+#define LL_FILE_READAHEA        0x00000004
+#define LL_FILE_LOCKED_DIRECTIO 0x00000008 /* client-side locks with dio */
+#define LL_FILE_LOCKLESS_IO     0x00000010 /* server-side locks with cio */
+#define LL_FILE_RMTACL          0x00000020

 
 #define LOV_USER_MAGIC_V1 0x0BD10BD0
 #define LOV_USER_MAGIC    LOV_USER_MAGIC_V1
 
 #define LOV_USER_MAGIC_V1 0x0BD10BD0
 #define LOV_USER_MAGIC    LOV_USER_MAGIC_V1