Whamcloud - gitweb
LU-14854 mdd: proper handle error in mdd_swap_layouts()
[fs/lustre-release.git] / lustre / mdd / mdd_object.c
index 77bf9a7..e431fdf 100644 (file)
@@ -1217,7 +1217,9 @@ int mdd_attr_set(const struct lu_env *env, struct md_object *obj,
        struct lu_attr *attr = MDD_ENV_VAR(env, cattr);
        const struct lu_attr *la = &ma->ma_attr;
        struct lu_ucred  *uc;
+       bool quota_reserved = false;
        bool chrgrp_by_unprivileged_user = false;
+       __s64 quota_size = 0;
        int rc;
        ENTRY;
 
@@ -1250,11 +1252,37 @@ int mdd_attr_set(const struct lu_env *env, struct md_object *obj,
        uc = lu_ucred_check(env);
        if (S_ISREG(attr->la_mode) && la->la_valid & LA_GID &&
            la->la_gid != attr->la_gid && uc != NULL && uc->uc_fsuid != 0) {
-               /* LU-10048: disable synchronous chgrp operation for it will
-                * cause deadlock between MDT and OST.
-               la_copy->la_valid |= LA_FLAGS;
-               la_copy->la_flags |= LUSTRE_SET_SYNC_FL;
-                */
+               CDEBUG(D_QUOTA, "%s: reserve quota for changing group: gid=%u size=%llu\n",
+                      mdd2obd_dev(mdd)->obd_name, la->la_gid, la->la_size);
+
+               if (la->la_valid & LA_BLOCKS)
+                       quota_size = la->la_blocks << 9;
+               else if (la->la_valid & LA_SIZE)
+                       quota_size = la->la_size;
+               /* use local attr gotten above */
+               else if (attr->la_valid & LA_BLOCKS)
+                       quota_size = attr->la_blocks << 9;
+               else if (attr->la_valid & LA_SIZE)
+                       quota_size = attr->la_size;
+
+               if (quota_size > 0) {
+                       rc = dt_reserve_or_free_quota(env, mdd->mdd_bottom,
+                                                     GRPQUOTA, attr->la_uid,
+                                                     la->la_gid, quota_size,
+                                                     false);
+
+                       if (rc) {
+                               CDEBUG(D_QUOTA, "%s: failed to reserve quota for gid %d size %llu\n",
+                                      mdd2obd_dev(mdd)->obd_name,
+                                      la->la_gid, quota_size);
+
+                               GOTO(out, rc);
+                       }
+
+                       quota_reserved = true;
+                       la_copy->la_valid |= LA_FLAGS;
+               }
+
                chrgrp_by_unprivileged_user = true;
 
                /* Flush the possible existing client setattr requests to OSTs
@@ -1330,6 +1358,21 @@ out:
                rc = mdd_attr_set_changelog(env, obj, handle, &ma->ma_pfid,
                                            la_copy->la_valid);
 
+       if (rc == 0 && quota_reserved) {
+               struct thandle *sub_th;
+
+               sub_th = thandle_get_sub_by_dt(env, handle, mdd->mdd_bottom);
+               if (unlikely(IS_ERR(sub_th))) {
+                       dt_reserve_or_free_quota(env, mdd->mdd_bottom, GRPQUOTA,
+                                                attr->la_uid, la->la_gid,
+                                                -quota_size, false);
+               } else {
+                       sub_th->th_reserved_quota.qrr_type = GRPQUOTA;
+                       sub_th->th_reserved_quota.qrr_id.qid_gid = la->la_gid;
+                       sub_th->th_reserved_quota.qrr_count = quota_size;
+               }
+       }
+
        if (handle != NULL)
                rc = mdd_trans_stop(env, mdd, rc, handle);
 
@@ -1546,58 +1589,58 @@ static int mdd_xattr_merge(const struct lu_env *env, struct md_object *md_obj,
        struct lu_buf *buf_vic = &mdd_env_info(env)->mdi_buf[1];
        struct lov_mds_md *lmm;
        struct thandle *handle;
-       int rc;
+       int rc, lock_order;
        ENTRY;
 
-       rc = lu_fid_cmp(mdd_object_fid(obj), mdd_object_fid(vic));
-       if (rc == 0) /* same fid */
+       lock_order = lu_fid_cmp(mdd_object_fid(obj), mdd_object_fid(vic));
+       if (lock_order == 0) /* same fid */
                RETURN(-EPERM);
 
        handle = mdd_trans_create(env, mdd);
        if (IS_ERR(handle))
                RETURN(PTR_ERR(handle));
 
-       if (rc > 0) {
-               mdd_write_lock(env, obj, DT_TGT_CHILD);
-               mdd_write_lock(env, vic, DT_TGT_CHILD);
-       } else {
-               mdd_write_lock(env, vic, DT_TGT_CHILD);
-               mdd_write_lock(env, obj, DT_TGT_CHILD);
-       }
-
        /* get EA of victim file */
        memset(buf_vic, 0, sizeof(*buf_vic));
        rc = mdd_stripe_get(env, vic, buf_vic, XATTR_NAME_LOV);
        if (rc < 0) {
                if (rc == -ENODATA)
                        rc = 0;
-               GOTO(out, rc);
+               GOTO(stop, rc);
        }
 
        /* parse the layout of victim file */
        lmm = buf_vic->lb_buf;
        if (le32_to_cpu(lmm->lmm_magic) != LOV_MAGIC_COMP_V1)
-               GOTO(out, rc = -EINVAL);
+               GOTO(stop, rc = -EINVAL);
 
        /* save EA of target file for restore */
        memset(buf, 0, sizeof(*buf));
        rc = mdd_stripe_get(env, obj, buf, XATTR_NAME_LOV);
        if (rc < 0)
-               GOTO(out, rc);
+               GOTO(stop, rc);
 
        /* Get rid of the layout from victim object */
        rc = mdd_declare_xattr_del(env, mdd, vic, XATTR_NAME_LOV, handle);
        if (rc)
-               GOTO(out, rc);
+               GOTO(stop, rc);
 
        rc = mdd_declare_xattr_set(env, mdd, obj, buf_vic, XATTR_NAME_LOV,
                                   LU_XATTR_MERGE, handle);
        if (rc)
-               GOTO(out, rc);
+               GOTO(stop, rc);
 
        rc = mdd_trans_start(env, mdd, handle);
        if (rc != 0)
-               GOTO(out, rc);
+               GOTO(stop, rc);
+
+       if (lock_order > 0) {
+               mdd_write_lock(env, obj, DT_TGT_CHILD);
+               mdd_write_lock(env, vic, DT_TGT_CHILD);
+       } else {
+               mdd_write_lock(env, vic, DT_TGT_CHILD);
+               mdd_write_lock(env, obj, DT_TGT_CHILD);
+       }
 
        rc = mdo_xattr_set(env, obj, buf_vic, XATTR_NAME_LOV, LU_XATTR_MERGE,
                           handle);
@@ -1625,9 +1668,10 @@ out_restore:
        }
 
 out:
-       mdd_trans_stop(env, mdd, rc, handle);
        mdd_write_unlock(env, obj);
        mdd_write_unlock(env, vic);
+stop:
+       mdd_trans_stop(env, mdd, rc, handle);
        lu_buf_free(buf);
        lu_buf_free(buf_vic);
 
@@ -2670,13 +2714,17 @@ out_restore:
                if (rc2 < 0)
                        goto do_lbug;
 
-               ++steps;
-               rc2 = mdd_xattr_hsm_replace(env, fst_o, fst_hsm_buf, handle);
-               if (rc2 < 0)
-                       goto do_lbug;
+               if (flags & SWAP_LAYOUTS_MDS_HSM) {
+                       ++steps;
+                       rc2 = mdd_xattr_hsm_replace(env, fst_o, fst_hsm_buf,
+                                                   handle);
+                       if (rc2 < 0)
+                               goto do_lbug;
 
-               ++steps;
-               rc2 = mdd_xattr_hsm_replace(env, snd_o, snd_hsm_buf, handle);
+                       ++steps;
+                       rc2 = mdd_xattr_hsm_replace(env, snd_o, snd_hsm_buf,
+                                                   handle);
+               }
 
        do_lbug:
                if (rc2 < 0) {