X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fuapi%2Flinux%2Flustre%2Flustre_idl.h;h=d368ecadbe63a0e9b0205066c20fdd7dc3a621db;hb=85011d372dfb50500ba5eef3f2fa79e5d6507539;hp=cf0281fd847e42fd456b1ba44c6ee6a32dc2e62d;hpb=b99344dda425b78e006c49b1d2b22c75585ca306;p=fs%2Flustre-release.git

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index cf0281f..d368eca 100644
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -564,11 +564,6 @@ static inline void lustre_handle_copy(struct lustre_handle *tgt,
 	tgt->cookie = src->cookie;
 }
 
-struct lustre_handle_array {
-	unsigned int		count;
-	struct lustre_handle	handles[0];
-};
-
 /* lustre_msg struct magic.  DON'T use swabbed values of MAGIC as magic! */
 enum lustre_msg_magic {
 	LUSTRE_MSG_MAGIC_V2		= 0x0BD00BD3,
@@ -812,6 +807,7 @@ struct ptlrpc_body_v2 {
 #define OBD_CONNECT2_LOCKAHEAD		 0x2ULL /* ladvise lockahead v2 */
 #define OBD_CONNECT2_DIR_MIGRATE	 0x4ULL /* migrate striped dir */
 #define OBD_CONNECT2_FLR		0x20ULL /* FLR support */
+#define OBD_CONNECT2_WBC_INTENTS	0x40ULL /* create/unlink/... intents for wbc, also operations under client-held parent locks */
 
 /* XXX README XXX:
  * Please DO NOT add flag values here before first ensuring that this same
@@ -2320,8 +2316,11 @@ static inline bool ldlm_extent_equal(const struct ldlm_extent *ex1,
 }
 
 struct ldlm_inodebits {
-        __u64 bits;
-	__u64 try_bits; /* optional bits to try */
+	__u64 bits;
+	union {
+		__u64 try_bits; /* optional bits to try */
+		__u64 cancel_bits; /* for lock convert */
+	};
 };
 
 struct ldlm_flock_wire {
@@ -2526,8 +2525,8 @@ struct cfg_marker {
  * Opcodes for multiple servers.
  */
 enum obd_cmd {
-        OBD_PING = 400,
-        OBD_LOG_CANCEL,
+	OBD_PING = 400,
+	OBD_LOG_CANCEL, /* Obsolete since 1.5. */
 	OBD_QC_CALLBACK, /* not used since 2.4 */
 	OBD_IDX_READ,
         OBD_LAST_OPC
@@ -2872,17 +2871,17 @@ struct llog_cookie {
 
 /** llog protocol */
 enum llogd_rpc_ops {
-        LLOG_ORIGIN_HANDLE_CREATE       = 501,
-        LLOG_ORIGIN_HANDLE_NEXT_BLOCK   = 502,
-        LLOG_ORIGIN_HANDLE_READ_HEADER  = 503,
-        LLOG_ORIGIN_HANDLE_WRITE_REC    = 504,
-        LLOG_ORIGIN_HANDLE_CLOSE        = 505,
-        LLOG_ORIGIN_CONNECT             = 506,
-	LLOG_CATINFO			= 507,  /* deprecated */
-        LLOG_ORIGIN_HANDLE_PREV_BLOCK   = 508,
-        LLOG_ORIGIN_HANDLE_DESTROY      = 509,  /* for destroy llog object*/
-        LLOG_LAST_OPC,
-        LLOG_FIRST_OPC                  = LLOG_ORIGIN_HANDLE_CREATE
+	LLOG_ORIGIN_HANDLE_CREATE	= 501,
+	LLOG_ORIGIN_HANDLE_NEXT_BLOCK	= 502,
+	LLOG_ORIGIN_HANDLE_READ_HEADER	= 503,
+	LLOG_ORIGIN_HANDLE_WRITE_REC	= 504, /* Obsolete by 2.1. */
+	LLOG_ORIGIN_HANDLE_CLOSE	= 505, /* Obsolete by 1.8. */
+	LLOG_ORIGIN_CONNECT		= 506, /* Obsolete by 2.4. */
+	LLOG_CATINFO			= 507, /* Obsolete by 2.3. */
+	LLOG_ORIGIN_HANDLE_PREV_BLOCK	= 508,
+	LLOG_ORIGIN_HANDLE_DESTROY	= 509, /* Obsolete. */
+	LLOG_LAST_OPC,
+	LLOG_FIRST_OPC			= LLOG_ORIGIN_HANDLE_CREATE
 };
 
 struct llogd_body {
@@ -3307,6 +3306,7 @@ enum update_type {
 	OUT_PUNCH		= 14,
 	OUT_READ		= 15,
 	OUT_NOOP		= 16,
+	OUT_XATTR_LIST		= 17,
 	OUT_LAST
 };