remove wrong chunk from bug 16882

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 319c200..7df1357 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -2212,23 +2212,32 @@ void _debug_req(struct ptlrpc_request *req, __u32 mask,
         va_list args;
 
         va_start(args, fmt);
-        libcfs_debug_vmsg2(data->msg_cdls, data->msg_subsys, mask,
-                data->msg_file, data->msg_fn, data->msg_line, fmt, args,
-                " req@%p x"LPD64"/t"LPD64" o%d->%s@%s:%d/%d lens %d/%d e %d "
-                "to %d dl %ld ref %d fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n",
-                req, req->rq_xid, req->rq_transno, opc,
-                req->rq_import ? obd2cli_tgt(req->rq_import->imp_obd) :
-                req->rq_export ?
-                (char*)req->rq_export->exp_client_uuid.uuid : "<?>",
-                req->rq_import ?
-                (char *)req->rq_import->imp_connection->c_remote_uuid.uuid :
-                req->rq_export ?
-                (char *)req->rq_export->exp_connection->c_remote_uuid.uuid :
-                "<?>", req->rq_request_portal,  req->rq_reply_portal,
-                req->rq_reqlen, req->rq_replen,
-                req->rq_early_count, req->rq_timeout, req->rq_deadline,
-                atomic_read(&req->rq_refcount), DEBUG_REQ_FLAGS(req),
-                req_fl, rep_fl, req->rq_status, rep_status);
+        libcfs_debug_vmsg2(data->msg_cdls, data->msg_subsys, mask, data->msg_file,
+                           data->msg_fn, data->msg_line, fmt, args,
+                           " req@%p x"LPD64"/t"LPD64"("LPD64") o%d->%s@%s:%d/%d"
+                           " lens %d/%d e %d to %d dl "CFS_TIME_T" ref %d "
+                           "fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n",
+                           req, req->rq_xid, req->rq_transno,
+                           req->rq_reqmsg ? lustre_msg_get_transno(req->rq_reqmsg) : 0,
+                           req->rq_reqmsg ? lustre_msg_get_opc(req->rq_reqmsg) : -1,
+                           req->rq_import ? obd2cli_tgt(req->rq_import->imp_obd) :
+                           req->rq_export ?
+                           (char*)req->rq_export->exp_client_uuid.uuid : "<?>",
+                           req->rq_import ?
+                           (char *)req->rq_import->imp_connection->c_remote_uuid.uuid :
+                           req->rq_export ?
+                           (char *)req->rq_export->exp_connection->c_remote_uuid.uuid : "<?>",
+                           req->rq_request_portal, req->rq_reply_portal,
+                           req->rq_reqlen, req->rq_replen,
+                           req->rq_early_count, req->rq_timeout, req->rq_deadline,
+                           atomic_read(&req->rq_refcount), DEBUG_REQ_FLAGS(req),
+                           req->rq_reqmsg && req_ptlrpc_body_swabbed(req) ?
+                           lustre_msg_get_flags(req->rq_reqmsg) : -1,
+                           req->rq_repmsg && rep_ptlrpc_body_swabbed(req) ?
+                           lustre_msg_get_flags(req->rq_repmsg) : -1,
+                           req->rq_status,
+                           req->rq_repmsg && rep_ptlrpc_body_swabbed(req) ?
+                           lustre_msg_get_status(req->rq_repmsg) : -1);
 }
 EXPORT_SYMBOL(_debug_req);