Branch b_release_1_4_6

Add comment for OBD_CONENCT_JOIN.
Avoid self-referential CROW description.
Remove large comment for OBD_CONNECT_TRUNCLOCK, it "hides" below flags.

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index 30f7467..5b44d17 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -229,15 +229,11 @@ static inline void lustre_msg_set_op_flags(struct lustre_msg *msg, int flags)
 #define OBD_CONNECT_REQPORTAL   0x40ULL /* Separate portal for non-IO reqs */
 #define OBD_CONNECT_ACL         0x80ULL /* client using access control lists */
 #define OBD_CONNECT_XATTR      0x100ULL /* client using extended attributes*/
-#define OBD_CONNECT_CROW      0x0200ULL /* OST is CROW able */
-/*
- * set by servers supporting taking extent locks during obd_punch(). Currently
- * is requested by liblustre clients only. See bug 9528.
- */
-#define OBD_CONNECT_TRUNCLOCK  0x400ULL /* server gets extent lock on punch */
+#define OBD_CONNECT_CROW       0x200ULL /* MDS+OST do object create-on-write */
+#define OBD_CONNECT_TRUNCLOCK  0x400ULL /* server gets locks for punch b=9528 */
 #define OBD_CONNECT_TRANSNO    0x800ULL /* replay is sending initial transno */
 #define OBD_CONNECT_IBITS     0x1000ULL /* support for inodebits locks */
-#define OBD_CONNECT_JOIN      0x2000ULL 
+#define OBD_CONNECT_JOIN      0x2000ULL /* files can be concatenated */
 
 #define MDS_CONNECT_SUPPORTED  (OBD_CONNECT_RDONLY|OBD_CONNECT_VERSION| \
                                 OBD_CONNECT_ACL|OBD_CONNECT_XATTR| \