LU-5633 ptlrpc: hold rq_lock when modify rq_flags

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

diff --git a/lustre/osd-ldiskfs/osd_quota_fmt.c b/lustre/osd-ldiskfs/osd_quota_fmt.c
index 0088d00..161c3a1 100644 (file)
--- a/lustre/osd-ldiskfs/osd_quota_fmt.c
+++ b/lustre/osd-ldiskfs/osd_quota_fmt.c
@@ -65,7 +65,7 @@ static ssize_t quota_read_blk(const struct lu_env *env,
 
        memset(buf, 0, LUSTRE_DQBLKSIZE);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
        /* type is set as -1 when reading old admin quota file */
        if (type != USRQUOTA && type != GRPQUOTA) {
                struct lu_buf   lu_buffer;
@@ -227,7 +227,7 @@ int walk_block_dqentry(const struct lu_env *env, struct osd_object *obj,
        ENTRY;
 
        /* check if the leaf block has been processed before */
-       cfs_list_for_each_entry(leaf, &it->oiq_list, oql_link) {
+       list_for_each_entry(leaf, &it->oiq_list, oql_link) {
                if (leaf->oql_blk == blk)
                        RETURN(1);
        }
@@ -244,7 +244,7 @@ int walk_block_dqentry(const struct lu_env *env, struct osd_object *obj,
        }
        ret = 1;
 
-       if (!le32_to_cpu(dqhead->dqdh_entries))
+       if (!le16_to_cpu(dqhead->dqdh_entries))
                GOTO(out_buf, ret);
 
        ddquot = (struct lustre_disk_dqblk_v2 *)GETENTRIES(buf);