LU-15880 quota: fix issues in reserving quota

[fs/lustre-release.git] / lustre / target / tgt_lastrcvd.c

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index 42d553d..387223c 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -872,28 +872,15 @@ static void tgt_cb_last_committed(struct lu_env *env, struct thandle *th,
        LASSERT(ccb->llcc_tgt != NULL);
        LASSERT(ccb->llcc_exp->exp_obd == ccb->llcc_tgt->lut_obd);
 
-       if (th->th_reserved_quota.qrr_count > 0) {
-               struct lu_env            temp_env;
-               int rc;
-
+       if (th->th_reserved_quota.lqi_space > 0) {
                CDEBUG(D_QUOTA, "free quota %llu %llu\n",
-                      th->th_reserved_quota.qrr_id.qid_gid,
-                      th->th_reserved_quota.qrr_count);
+                      th->th_reserved_quota.lqi_id.qid_gid,
+                      th->th_reserved_quota.lqi_space);
 
-               rc = lu_env_init(&temp_env, LCT_DT_THREAD);
-               if (rc) {
-                       CERROR("%s: can't initialize environment: rc = %d\n",
-                              ccb->llcc_tgt->lut_obd->obd_name, rc);
-                       goto out;
-               }
-
-               dt_reserve_or_free_quota(&temp_env, th->th_dev,
-                                        th->th_reserved_quota.qrr_type,
-                                        th->th_reserved_quota.qrr_id.qid_uid,
-                                        th->th_reserved_quota.qrr_id.qid_gid,
-                                        -th->th_reserved_quota.qrr_count,
-                                        false);
-               lu_env_fini(&temp_env);
+               /* env can be NULL for freeing reserved quota */
+               th->th_reserved_quota.lqi_space *= -1;
+               dt_reserve_or_free_quota(NULL, th->th_dev,
+                                        &th->th_reserved_quota);
        }
 
        /* error hit, don't update last committed to provide chance to
@@ -973,6 +960,7 @@ static int tgt_is_local_client(const struct lu_env *env,
        struct lu_target        *tgt = class_exp2tgt(exp);
        struct tgt_session_info *tsi = tgt_ses_info(env);
        struct ptlrpc_request   *req = tgt_ses_req(tsi);
+       struct lnet_nid nid;
 
        if (exp_connect_flags(exp) & OBD_CONNECT_MDS ||
            exp_connect_flags(exp) & OBD_CONNECT_MDS_MDS)
@@ -981,7 +969,8 @@ static int tgt_is_local_client(const struct lu_env *env,
                return 0;
        if (!req)
                return 0;
-       if (!LNetIsPeerLocal(req->rq_peer.nid))
+       lnet_nid4_to_nid(req->rq_peer.nid, &nid);
+       if (!LNetIsPeerLocal(&nid))
                return 0;
 
        return 1;
@@ -1309,11 +1298,15 @@ int tgt_mk_reply_data(const struct lu_env *env,
        struct lsd_reply_data   *lrd;
        __u64                   *pre_versions = NULL;
        int                     rc;
+       struct tgt_session_info *tsi = NULL;
 
        OBD_ALLOC_PTR(trd);
        if (unlikely(trd == NULL))
                RETURN(-ENOMEM);
 
+       if (env != NULL)
+               tsi = tgt_ses_info(env);
+
        /* fill reply data information */
        lrd = &trd->trd_reply;
        lrd->lrd_transno = transno;
@@ -1326,10 +1319,7 @@ int tgt_mk_reply_data(const struct lu_env *env,
                        lrd->lrd_result = th->th_result;
                }
        } else {
-               struct tgt_session_info *tsi;
-
                LASSERT(env != NULL);
-               tsi = tgt_ses_info(env);
                LASSERT(tsi->tsi_xid != 0);
 
                lrd->lrd_xid = tsi->tsi_xid;
@@ -1345,6 +1335,9 @@ int tgt_mk_reply_data(const struct lu_env *env,
                trd->trd_pre_versions[3] = pre_versions[3];
        }
 
+       if (tsi && tsi->tsi_open_obj)
+               trd->trd_object = *lu_object_fid(&tsi->tsi_open_obj->do_lu);
+
        rc = tgt_add_reply_data(env, tgt, ted, trd, req,
                                th, write_update);
        if (rc < 0) {
@@ -2108,6 +2101,7 @@ int tgt_reply_data_init(const struct lu_env *env, struct lu_target *tgt)
                        trd->trd_pre_versions[3] = 0;
                        trd->trd_index = idx;
                        trd->trd_tag = 0;
+                       fid_zero(&trd->trd_object);
                        list_add(&trd->trd_list, &ted->ted_reply_list);
                        ted->ted_reply_cnt++;
                        if (ted->ted_reply_cnt > ted->ted_reply_max)