static inline dqbuf_t getdqbuf(void)
{
- dqbuf_t buf = cfs_alloc(LUSTRE_DQBLKSIZE, CFS_ALLOC_IO);
+ dqbuf_t buf = kmalloc(LUSTRE_DQBLKSIZE, GFP_NOFS);
if (!buf)
CWARN("Not enough memory for quota buffers.\n");
return buf;
static inline void freedqbuf(dqbuf_t buf)
{
- cfs_free(buf);
+ kfree(buf);
}
/**
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;
int type, uint blk, uint index,
struct osd_it_quota *it)
{
- dqbuf_t buf = getdqbuf();
+ dqbuf_t buf;
loff_t ret = 0;
struct lustre_disk_dqdbheader *dqhead;
int i, dqblk_sz;
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);
}
+ buf = getdqbuf();
dqhead = (struct lustre_disk_dqdbheader *)buf;
dqblk_sz = sizeof(struct lustre_disk_dqblk_v2);
if (!buf)
}
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);