LU-3581 osc: Lustre returns EINTR from writes when SA_RESTART is set

[fs/lustre-release.git] / lustre / quota / qmt_entry.c

diff --git a/lustre/quota/qmt_entry.c b/lustre/quota/qmt_entry.c
index 59a0653..8bd9424 100644 (file)
--- a/lustre/quota/qmt_entry.c
+++ b/lustre/quota/qmt_entry.c
@@ -21,17 +21,13 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012 Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
  * Author: Niu    Yawei    <yawei.niu@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include "qmt_internal.h"
@@ -47,7 +43,7 @@ static void qmt_lqe_init(struct lquota_entry *lqe, void *arg)
        LASSERT(lqe_is_master(lqe));
 
        lqe->lqe_revoke_time = 0;
-       cfs_init_rwsem(&lqe->lqe_sem);
+       init_rwsem(&lqe->lqe_sem);
 }
 
 /*
@@ -261,21 +257,16 @@ int qmt_glb_write(const struct lu_env *env, struct thandle *th,
 
        LQUOTA_DEBUG(lqe, "write glb");
 
-       if (!lqe->lqe_enforced && lqe->lqe_granted == 0 &&
-           lqe->lqe_id.qid_uid != 0) {
-               /* quota isn't enforced any more for this entry and there is no
-                * more space granted to slaves, let's just remove the entry
-                * from the index */
-               rec = NULL;
-       } else {
-               rec = &qti->qti_glb_rec;
+       /* never delete the entry even when the id isn't enforced and
+        * no any guota granted, otherwise, this entry will not be
+        * synced to slave during the reintegration. */
+       rec = &qti->qti_glb_rec;
 
-               /* fill global index with updated quota settings */
-               rec->qbr_granted   = lqe->lqe_granted;
-               rec->qbr_hardlimit = lqe->lqe_hardlimit;
-               rec->qbr_softlimit = lqe->lqe_softlimit;
-               rec->qbr_time      = lqe->lqe_gracetime;
-       }
+       /* fill global index with updated quota settings */
+       rec->qbr_granted   = lqe->lqe_granted;
+       rec->qbr_hardlimit = lqe->lqe_hardlimit;
+       rec->qbr_softlimit = lqe->lqe_softlimit;
+       rec->qbr_time      = lqe->lqe_gracetime;
 
        /* write new quota settings */
        rc = lquota_disk_write(env, th, LQE_GLB_OBJ(lqe), &lqe->lqe_id,
@@ -372,16 +363,12 @@ int qmt_slv_write(const struct lu_env *env, struct thandle *th,
        LQUOTA_DEBUG(lqe, "write slv "DFID" granted:"LPU64,
                     PFID(lu_object_fid(&slv_obj->do_lu)), granted);
 
-       if (granted == 0) {
-               /* this slave does not own any quota space for this ID any more,
-                * so let's just remove the entry from the index */
-               rec = NULL;
-       } else {
-               rec = &qti->qti_slv_rec;
+       /* never delete the entry, otherwise, it'll not be transferred
+        * to slave during reintegration. */
+       rec = &qti->qti_slv_rec;
 
-               /* updated space granted to this slave */
-               rec->qsr_granted = granted;
-       }
+       /* updated space granted to this slave */
+       rec->qsr_granted = granted;
 
        /* write new granted space */
        rc = lquota_disk_write(env, th, slv_obj, &lqe->lqe_id,
@@ -425,7 +412,7 @@ void qmt_adjust_edquot(struct lquota_entry *lqe, __u64 now)
        struct qmt_pool_info    *pool = lqe2qpi(lqe);
        ENTRY;
 
-       if (!lqe->lqe_enforced)
+       if (!lqe->lqe_enforced || lqe->lqe_id.qid_uid == 0)
                RETURN_EXIT;
 
        if (!lqe->lqe_edquot) {
@@ -554,7 +541,7 @@ void qmt_adjust_qunit(const struct lu_env *env, struct lquota_entry *lqe)
 
        LASSERT(lqe_is_locked(lqe));
 
-       if (!lqe->lqe_enforced)
+       if (!lqe->lqe_enforced || lqe->lqe_id.qid_uid == 0)
                /* no quota limits */
                RETURN_EXIT;