LU-13509 ptlrpc: Clear bd_registered in ptlrpc_unregister_bulk

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

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index b26f4d7..d4b3585 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -127,13 +127,14 @@ extern char obd_jobid_var[];
 #define RECONNECT_DELAY_MAX (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC + \
                              INITIAL_CONNECT_TIMEOUT)
 /* The min time a target should wait for clients to reconnect in recovery */
-#define OBD_RECOVERY_TIME_MIN    (2*RECONNECT_DELAY_MAX)
-#define OBD_IR_FACTOR_MIN         1
-#define OBD_IR_FACTOR_MAX         10
-#define OBD_IR_FACTOR_DEFAULT    (OBD_IR_FACTOR_MAX/2)
+#define OBD_RECOVERY_TIME_MIN  (2*RECONNECT_DELAY_MAX)
+#define OBD_IR_FACTOR_MIN      1
+#define OBD_IR_FACTOR_MAX      10
+#define OBD_IR_FACTOR_DEFAULT  (OBD_IR_FACTOR_MAX/2)
 /* default timeout for the MGS to become IR_FULL */
-#define OBD_IR_MGS_TIMEOUT       (4*obd_timeout)
-#define LONG_UNLINK 300          /* Unlink should happen before now */
+#define OBD_IR_MGS_TIMEOUT     (4*obd_timeout)
+/* Unlink should happen within this many seconds. */
+#define PTLRPC_REQ_LONG_UNLINK 300
 
 /**
  * Time interval of shrink, if the client is "idle" more than this interval,
@@ -344,15 +345,16 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OST_DELAY_TRANS        0x246
 #define OBD_FAIL_OST_PREPARE_DELAY      0x247
 #define OBD_FAIL_OST_2BIG_NIOBUF        0x248
+#define OBD_FAIL_OST_FALLOCATE_NET      0x249
 
 #define OBD_FAIL_LDLM                    0x300
 #define OBD_FAIL_LDLM_NAMESPACE_NEW      0x301
-#define OBD_FAIL_LDLM_ENQUEUE_NET                      0x302
-#define OBD_FAIL_LDLM_CONVERT_NET                      0x303
-#define OBD_FAIL_LDLM_CANCEL_NET                       0x304
-#define OBD_FAIL_LDLM_BL_CALLBACK_NET                  0x305
-#define OBD_FAIL_LDLM_CP_CALLBACK_NET                  0x306
-#define OBD_FAIL_LDLM_GL_CALLBACK_NET                  0x307
+#define OBD_FAIL_LDLM_ENQUEUE_NET       0x302
+#define OBD_FAIL_LDLM_CONVERT_NET       0x303
+#define OBD_FAIL_LDLM_CANCEL_NET        0x304
+#define OBD_FAIL_LDLM_BL_CALLBACK_NET   0x305
+#define OBD_FAIL_LDLM_CP_CALLBACK_NET   0x306
+#define OBD_FAIL_LDLM_GL_CALLBACK_NET   0x307
 #define OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR 0x308
 #define OBD_FAIL_LDLM_ENQUEUE_INTENT_ERR 0x309
 #define OBD_FAIL_LDLM_CREATE_RESOURCE    0x30a
@@ -446,6 +448,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_PTLRPC_LONG_BOTH_UNLINK 0x51c
 #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB3  0x520
 #define OBD_FAIL_PTLRPC_BULK_ATTACH      0x521
+#define OBD_FAIL_PTLRPC_BULK_REPLY_ATTACH      0x522
 #define OBD_FAIL_PTLRPC_RESEND_RACE     0x525
 #define OBD_FAIL_PTLRPC_ROUND_XID       0x530
 #define OBD_FAIL_PTLRPC_CONNECT_RACE    0x531
@@ -912,7 +915,7 @@ do {                                                                              \
 do {                                                                         \
        LASSERT(ergo((type) != GFP_ATOMIC, !in_interrupt()));                 \
        (ptr) = (cptab) == NULL ?                                             \
-               kmem_cache_alloc(slab, (type) | __GFP_ZERO) :                 \
+               kmem_cache_zalloc(slab, (type)) :                             \
                cfs_mem_cache_cpt_alloc(slab, cptab, cpt, (type) | __GFP_ZERO); \
        if (likely((ptr)))                                                    \
                OBD_ALLOC_POST(ptr, size, "slab-alloced");                    \