LU-8066 mdc: move mdc-specific procfs files to sysfs

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_quota.c

diff --git a/lustre/osd-ldiskfs/osd_quota.c b/lustre/osd-ldiskfs/osd_quota.c
index 90e8ad6..7e15425 100644 (file)
--- a/lustre/osd-ldiskfs/osd_quota.c
+++ b/lustre/osd-ldiskfs/osd_quota.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann@whamcloud.com>
@@ -72,8 +72,7 @@ int osd_acct_obj_lookup(struct osd_thread_info *info, struct osd_device *osd,
        ENTRY;
        LASSERT(fid_is_acct(fid));
 
-       if (!LDISKFS_HAS_RO_COMPAT_FEATURE(sb,
-                                          LDISKFS_FEATURE_RO_COMPAT_QUOTA))
+       if (!ldiskfs_has_feature_quota(sb))
                RETURN(-ENOENT);
 
        id->oii_gen = OSD_OII_NOGEN;
@@ -87,16 +86,14 @@ int osd_acct_obj_lookup(struct osd_thread_info *info, struct osd_device *osd,
                        le32_to_cpu(LDISKFS_SB(sb)->s_es->s_grp_quota_inum);
                break;
        case PRJQUOTA:
-#ifdef HAVE_PROJECT_QUOTA
-               if (!LDISKFS_HAS_RO_COMPAT_FEATURE(sb,
-                               LDISKFS_FEATURE_RO_COMPAT_PROJECT))
-                       RETURN(-ENOTSUPP);
-               id->oii_ino =
-                       le32_to_cpu(LDISKFS_SB(sb)->s_es->s_prj_quota_inum);
+ #ifdef HAVE_PROJECT_QUOTA
+               if (ldiskfs_has_feature_project(sb))
+                       id->oii_ino =
+                               le32_to_cpu(LDISKFS_SB(sb)->s_es->s_prj_quota_inum);
+               else
+ #endif
+                       RETURN(-ENOENT);
                break;
-#else
-               RETURN(-ENOTSUPP);
-#endif
        }
        if (!ldiskfs_valid_inum(sb, id->oii_ino))
                RETURN(-ENOENT);
@@ -438,7 +435,17 @@ static __u64 osd_it_acct_store(const struct lu_env *env,
 static int osd_it_acct_load(const struct lu_env *env,
                            const struct dt_it *di, __u64 hash)
 {
+       struct osd_it_quota *it = (struct osd_it_quota *)di;
+
        ENTRY;
+
+       /* LU-8999 - If it is called to resume the iteration, calling
+        * osd_it_acct_get could change the block orders in the lower level
+        * of the quota tree, which are saved in osd_it_quota->oiq_blk.
+        * */
+       if (it->oiq_id != 0 && it->oiq_id == hash)
+               RETURN(1);
+
        RETURN(osd_it_acct_get(env, (struct dt_it *)di,
                               (const struct dt_key *)&hash));
 }
@@ -611,30 +618,30 @@ int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh,
  * \param  space  - how many blocks/inodes will be consumed/released
  * \param  oh     - osd transaction handle
  * \param  obj    - osd object, could be NULL when it's under create
- * \param  is_blk - block quota or inode quota?
  * \param  flags  - if the operation is write, return no user quota, no
  *                  group quota, or sync commit flags to the caller
- * \param force   - set to 1 when changes are performed by root user and thus
- *                  can't failed with EDQUOT
+ * \param osd_qid_flags - indicate this is a inode/block accounting
+ *                     and whether changes are performed by root user
  *
  * \retval 0      - success
  * \retval -ve    - failure
  */
 int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid,
                          __u32 projid, long long space, struct osd_thandle *oh,
-                         struct osd_object *obj, bool is_blk, int *flags,
-                         bool force)
+                         struct osd_object *obj, int *flags,
+                         enum osd_qid_declare_flags osd_qid_declare_flags)
 {
        struct osd_thread_info  *info = osd_oti_get(env);
        struct lquota_id_info   *qi = &info->oti_qi;
-       int                      rcu, rcg, rcp; /* user & group & project rc */
+       int rcu, rcg, rcp = 0; /* user & group & project rc */
+       bool force = !!(osd_qid_declare_flags & OSD_QID_FORCE);
        ENTRY;
 
        /* let's start with user quota */
        qi->lqi_id.qid_uid = uid;
        qi->lqi_type       = USRQUOTA;
        qi->lqi_space      = space;
-       qi->lqi_is_blk     = is_blk;
+       qi->lqi_is_blk     = !!(osd_qid_declare_flags & OSD_QID_BLK);
        rcu = osd_declare_qid(env, oh, qi, obj, true, flags);
 
        if (force && (rcu == -EDQUOT || rcu == -EINPROGRESS))
@@ -656,24 +663,20 @@ int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid,
        if (force && (rcg == -EDQUOT || rcg == -EINPROGRESS))
                /* as before, ignore EDQUOT & EINPROGRESS for root */
                rcg = 0;
+
+#ifdef HAVE_PROJECT_QUOTA
        if (rcg && (rcg != -EDQUOT || flags == NULL))
                RETURN(rcg);
 
        /* and now project quota */
-       qi->lqi_id.qid_gid = projid;
-       qi->lqi_type       = PRJQUOTA;
+       qi->lqi_id.qid_projid = projid;
+       qi->lqi_type = PRJQUOTA;
        rcp = osd_declare_qid(env, oh, qi, obj, true, flags);
 
        if (force && (rcp == -EDQUOT || rcp == -EINPROGRESS))
                /* as before, ignore EDQUOT & EINPROGRESS for root */
                rcp = 0;
+#endif
 
-       if (rcu)
-               RETURN(rcu);
-       if (rcg)
-               RETURN(rcg);
-       if (rcp)
-               RETURN(rcp);
-
-       RETURN(0);
+       RETURN(rcu ? rcu : (rcg ? rcg : rcp));
 }