b=22129 add debug patch for 22129

i=Robert
i=Fangyong

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index c5ab340..8c3f7d6 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -592,9 +592,10 @@ ptlrpc_rqphase2str(struct ptlrpc_request *req)
         FLAG(req->rq_restart, "T"), FLAG(req->rq_replay, "P"),                  \
         FLAG(req->rq_no_resend, "N"),                                           \
         FLAG(req->rq_waiting, "W"),                                             \
-        FLAG(req->rq_wait_ctx, "C"), FLAG(req->rq_hp, "H")
+        FLAG(req->rq_wait_ctx, "C"), FLAG(req->rq_hp, "H"),                     \
+        FLAG(req->rq_committed, "M")
 
-#define REQ_FLAGS_FMT "%s:%s%s%s%s%s%s%s%s%s%s%s"
+#define REQ_FLAGS_FMT "%s:%s%s%s%s%s%s%s%s%s%s%s%s"
 
 void _debug_req(struct ptlrpc_request *req, __u32 mask,
                 struct libcfs_debug_msg_data *data, const char *fmt, ...)

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 7a4901b..23f52e5 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -875,6 +875,7 @@ int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
                  * exists and return no error in that case
                  */
                 if (mod) {
+                        DEBUG_REQ(D_HA, req, "Reset ESTALE = %d", rc);
                         LASSERT(mod->mod_open_req != NULL);
                         if (mod->mod_open_req->rq_committed)
                                 rc = 0;