LU-4840 lfs: Use file lease to implement migration

[fs/lustre-release.git] / lustre / mdc / mdc_lib.c

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index c52b6a2..ca3ed9e 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -492,26 +492,28 @@ void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, __u32 flags,
                              op_data->op_namelen);
 }
 
-static void mdc_hsm_release_pack(struct ptlrpc_request *req,
-                                struct md_op_data *op_data)
+static void mdc_intent_close_pack(struct ptlrpc_request *req,
+                                 struct md_op_data *op_data)
 {
-       if (op_data->op_bias & MDS_HSM_RELEASE) {
-               struct close_data *data;
-               struct ldlm_lock *lock;
+       struct close_data       *data;
+       struct ldlm_lock        *lock;
+       enum mds_op_bias         bias = op_data->op_bias;
 
-               data = req_capsule_client_get(&req->rq_pill, &RMF_CLOSE_DATA);
-               LASSERT(data != NULL);
+       if (!(bias & (MDS_HSM_RELEASE | MDS_CLOSE_LAYOUT_SWAP)))
+               return;
 
-               lock = ldlm_handle2lock(&op_data->op_lease_handle);
-               if (lock != NULL) {
-                       data->cd_handle = lock->l_remote_handle;
-                       LDLM_LOCK_PUT(lock);
-               }
-               ldlm_cli_cancel(&op_data->op_lease_handle, LCF_LOCAL);
+       data = req_capsule_client_get(&req->rq_pill, &RMF_CLOSE_DATA);
+       LASSERT(data != NULL);
 
-               data->cd_data_version = op_data->op_data_version;
-               data->cd_fid = op_data->op_fid2;
+       lock = ldlm_handle2lock(&op_data->op_lease_handle);
+       if (lock != NULL) {
+               data->cd_handle = lock->l_remote_handle;
+               LDLM_LOCK_PUT(lock);
        }
+       ldlm_cli_cancel(&op_data->op_lease_handle, LCF_LOCAL);
+
+       data->cd_data_version = op_data->op_data_version;
+       data->cd_fid = op_data->op_fid2;
 }
 
 void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
@@ -525,5 +527,5 @@ void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
         mdc_setattr_pack_rec(rec, op_data);
         mdc_pack_capa(req, &RMF_CAPA1, op_data->op_capa1);
         mdc_ioepoch_pack(epoch, op_data);
-       mdc_hsm_release_pack(req, op_data);
+       mdc_intent_close_pack(req, op_data);
 }