Branch b1_6

b=17971
i=green
i=shadow

initialize it_lock_mode and it_lock_handle in one place.

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index c44fbfe..50c719e 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -454,6 +454,7 @@ static int mdc_finish_enqueue(struct obd_export *exp,
         it->d.lustre.it_disposition = (int)lockrep->lock_policy_res1;
         it->d.lustre.it_status = (int)lockrep->lock_policy_res2;
         it->d.lustre.it_lock_mode = einfo->ei_mode;
+        it->d.lustre.it_lock_handle = lockh->cookie;
         it->d.lustre.it_data = req;
 
         if (it->d.lustre.it_status < 0 && req->rq_replay)
@@ -787,7 +788,6 @@ int mdc_intent_lock(struct obd_export *exp, struct mdc_op_data *op_data,
                                  lmm, lmmsize, extra_lock_flags);
                 if (rc < 0)
                         RETURN(rc);
-                memcpy(&it->d.lustre.it_lock_handle, &lockh, sizeof(lockh));
         } else if (!op_data->fid2.id) {
                 /* DISP_ENQ_COMPLETE set means there is extra reference on
                  * request referenced from this intent, saved for subsequent
@@ -836,8 +836,6 @@ static int mdc_intent_getattr_async_interpret(struct ptlrpc_request *req,
         if (rc)
                 GOTO(out, rc);
 
-        memcpy(&it->d.lustre.it_lock_handle, lockh, sizeof(*lockh));
-
         rc = mdc_finish_intent_lock(exp, req, &minfo->mi_data, it, lockh);
         GOTO(out, rc);
 out: