* GPL HEADER END
*/
/*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
* Use is subject to license terms.
*
* Lustre administrative quota format.
ENTRY;
memset(buf, 0, LUSTRE_DQBLKSIZE);
-
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0)
- /* type is set as -1 when reading old admin quota file */
- if (type != USRQUOTA && type != GRPQUOTA) {
- struct lu_buf lu_buffer;
- loff_t pos;
-
- lu_buffer.lb_buf = buf;
- lu_buffer.lb_len = LUSTRE_DQBLKSIZE;
- pos = blk << LUSTRE_DQBLKSIZE_BITS;
-
- ret = dt_record_read(env, &obj->oo_dt, &lu_buffer, &pos);
-
- if (ret == 0)
- ret = LUSTRE_DQBLKSIZE;
- else if (ret == -EBADR || ret == -EFAULT)
- ret = 0;
- RETURN(ret);
- }
-#else
-#warning "remove old quota compatibility code"
-#endif
+ LASSERTF((type == USRQUOTA || type == GRPQUOTA), "type=%d\n", type);
ret = sb->s_op->quota_read(sb, type, buf, LUSTRE_DQBLKSIZE,
blk << LUSTRE_DQBLKSIZE_BITS);
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);
}
}
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);
depth + 1, 0, it);
else
ret = walk_block_dqentry(env, obj, type, blk, 0, it);
- }
- if (ret == 0) { /* Entry found */
- it->oiq_blk[depth + 1] = blk;
- it->oiq_index[depth] = index;
}
+ it->oiq_blk[depth + 1] = blk;
+ it->oiq_index[depth] = index;
out_buf:
freedqbuf(buf);