patches related to bug 13377 (CMD small fixes), 2+4 patch and fid_unpack patch

[fs/lustre-release.git] / lustre / include / lustre / lustre_idl.h

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 56910b0..bc2cfd2 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -289,7 +289,7 @@ struct lu_fid_pack {
 
 void fid_pack(struct lu_fid_pack *pack, const struct lu_fid *fid,
               struct lu_fid *befider);
-void fid_unpack(const struct lu_fid_pack *pack, struct lu_fid *fid);
+int  fid_unpack(const struct lu_fid_pack *pack, struct lu_fid *fid);
 
 /* __KERNEL__ */
 #endif
@@ -520,10 +520,12 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
 #define OBD_CONNECT_QUOTA64    0x00080000ULL /* 64bit qunit_data.qd_count b=10707*/
 #define OBD_CONNECT_MDS_CAPA   0x00100000ULL /* MDS capability */
 #define OBD_CONNECT_OSS_CAPA   0x00200000ULL /* OSS capability */
-#define OBD_CONNECT_MDS_MDS    0x00400000ULL /* MDS-MDS connection*/
+#define OBD_CONNECT_CANCELSET  0x00400000ULL /* Early batched cancels. */
 #define OBD_CONNECT_SOM        0x00800000ULL /* SOM feature */
-#define OBD_CONNECT_CANCELSET  0x01000000ULL /* Early batched cancels. */
-#define OBD_CONNECT_REAL       0x00000200ULL /* real connection */
+#define OBD_CONNECT_AT         0x01000000ULL /* client uses adaptive timeouts */
+#define OBD_CONNECT_LRU_RESIZE 0x02000000ULL /* Lru resize feature. */
+#define OBD_CONNECT_MDS_MDS    0x04000000ULL /* MDS-MDS connection*/
+#define OBD_CONNECT_REAL       0x08000000ULL /* real connection */
 /* also update obd_connect_names[] for lprocfs_rd_connect_flags()
  * and lustre/utils/wirecheck.c */
 
@@ -543,7 +545,7 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
 #define ECHO_CONNECT_SUPPORTED (0)
 #define MGS_CONNECT_SUPPORTED  (OBD_CONNECT_VERSION)
 
-#define MAX_QUOTA_COUNT32 ((0xffffffffULL >> QUOTABLOCK_BITS) << QUOTABLOCK_BITS)
+#define MAX_QUOTA_COUNT32 (0xffffffffULL)
 
 #define OBD_OCD_VERSION(major,minor,patch,fix) (((major)<<24) + ((minor)<<16) +\
                                                 ((patch)<<8) + (fix))
@@ -1974,13 +1976,14 @@ typedef enum {
 /* NB take care when changing the sequence of elements this struct,
  * because the offset info is used in find_capa() */
 struct lustre_capa {
-        struct lu_fid   lc_fid;       /* fid */
-        __u64           lc_opc;       /* operations allowed */
-        __u32           lc_uid;       /* uid, this is legacy and for OSS only */
-        __u32           lc_flags;     /* HMAC algorithm & flags */
-        __u32           lc_keyid;     /* key used for the capability */
-        __u32           lc_timeout;   /* capa timeout value (sec) */
-        __u64           lc_expiry;    /* expiry time (sec) */
+        struct lu_fid   lc_fid;     /* fid */
+        __u64           lc_opc;     /* operations allowed */
+        __u32           lc_uid;     /* uid, it is obsolete, but maybe used in
+                                     * future, reserve it for 64-bits aligned.*/
+        __u32           lc_flags;   /* HMAC algorithm & flags */
+        __u32           lc_keyid;   /* key used for the capability */
+        __u32           lc_timeout; /* capa timeout value (sec) */
+        __u64           lc_expiry;  /* expiry time (sec) */
         __u8            lc_hmac[CAPA_HMAC_MAX_LEN];   /* HMAC */
 } __attribute__((packed));