LU-6808 ptlrpc: properly set "rq_xid" for 4MB IO

[fs/lustre-release.git] / lustre / ldlm / ldlm_lib.c

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index e05873c..95e566d 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -3174,8 +3174,7 @@ int target_bulk_io(struct obd_export *exp, struct ptlrpc_bulk_desc *desc,
                if (req->rq_bulk_read)
                        rc = sptlrpc_svc_wrap_bulk(req, desc);
 
-               if ((exp->exp_connect_data.ocd_connect_flags &
-                    OBD_CONNECT_BULK_MBITS) != 0)
+               if (OCD_HAS_FLAG(&exp->exp_connect_data, BULK_MBITS))
                        req->rq_mbits = lustre_msg_get_mbits(req->rq_reqmsg);
                else /* old version, bulk matchbits is rq_xid */
                        req->rq_mbits = req->rq_xid;