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 0db82ed..387223c 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * Lustre Unified Target
  * These are common function to work with last_received file
@@ -529,7 +528,7 @@ static void tgt_cb_new_client(struct lu_env *env, struct thandle *th,
 {
        struct tgt_new_client_callback *ccb;
 
-       ccb = container_of0(cb, struct tgt_new_client_callback, lncc_cb);
+       ccb = container_of(cb, struct tgt_new_client_callback, lncc_cb);
 
        LASSERT(ccb->lncc_exp->exp_obd);
 
@@ -867,12 +866,23 @@ static void tgt_cb_last_committed(struct lu_env *env, struct thandle *th,
 {
        struct tgt_last_committed_callback *ccb;
 
-       ccb = container_of0(cb, struct tgt_last_committed_callback, llcc_cb);
+       ccb = container_of(cb, struct tgt_last_committed_callback, llcc_cb);
 
        LASSERT(ccb->llcc_exp);
        LASSERT(ccb->llcc_tgt != NULL);
        LASSERT(ccb->llcc_exp->exp_obd == ccb->llcc_tgt->lut_obd);
 
+       if (th->th_reserved_quota.lqi_space > 0) {
+               CDEBUG(D_QUOTA, "free quota %llu %llu\n",
+                      th->th_reserved_quota.lqi_id.qid_gid,
+                      th->th_reserved_quota.lqi_space);
+
+               /* 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
         * replay data after fail */
        if (err != 0)
@@ -950,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)
@@ -958,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;
@@ -1286,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;
@@ -1303,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;
@@ -1322,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) {
@@ -1343,11 +1359,11 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
 {
        struct tgt_thread_info  *tti = tgt_th_info(env);
        struct tgt_session_info *tsi = tgt_ses_info(env);
-       struct obd_export       *exp = tsi->tsi_exp;
-       struct tg_export_data   *ted;
-       __u64                   *transno_p;
-       int                      rc = 0;
-       bool                     lw_client;
+       struct obd_export *exp = tsi->tsi_exp;
+       struct tg_export_data *ted;
+       __u64 *transno_p;
+       bool nolcd = false;
+       int rc = 0;
 
        ENTRY;
 
@@ -1355,11 +1371,15 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
        LASSERT(exp != NULL);
        ted = &exp->exp_target_data;
 
-       lw_client = exp_connect_flags(exp) & OBD_CONNECT_LIGHTWEIGHT;
-       if (ted->ted_lr_idx < 0 && !lw_client)
-               /* ofd connect may cause transaction before export has
-                * last_rcvd slot */
-               RETURN(0);
+       /* Some clients don't support recovery, and they don't have last_rcvd
+        * client data:
+        * 1. lightweight clients.
+        * 2. local clients on MDS which doesn't enable "localrecov".
+        * 3. OFD connect may cause transaction before export has last_rcvd
+        *    slot.
+        */
+       if (ted->ted_lr_idx < 0)
+               nolcd = true;
 
        if (req != NULL)
                tti->tti_transno = lustre_msg_get_transno(req->rq_reqmsg);
@@ -1400,14 +1420,13 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
        /* if can't add callback, do sync write */
        th->th_sync |= !!tgt_last_commit_cb_add(th, tgt, exp, tti->tti_transno);
 
-       if (lw_client) {
-               /* All operations performed by LW clients are synchronous and
-                * we store the committed transno in the last_rcvd header */
+       if (nolcd) {
+               /* store transno in the last_rcvd header */
                spin_lock(&tgt->lut_translock);
                if (tti->tti_transno > tgt->lut_lsd.lsd_last_transno) {
                        tgt->lut_lsd.lsd_last_transno = tti->tti_transno;
                        spin_unlock(&tgt->lut_translock);
-                       /* Although lightweight (LW) connections have no slot
+                       /* Although current connection doesn't have slot
                         * in the last_rcvd, we still want to maintain
                         * the in-memory lsd_client_data structure in order to
                         * properly handle reply reconstruction. */
@@ -1480,7 +1499,7 @@ static int tgt_last_rcvd_update(const struct lu_env *env, struct lu_target *tgt,
                }
        }
 
-       if (!lw_client) {
+       if (!nolcd) {
                tti->tti_off = ted->ted_lr_off;
                if (CFS_FAIL_CHECK(OBD_FAIL_TGT_RCVD_EIO))
                        rc = -EIO;
@@ -2082,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)