LU-5061 obd: add rnb_ prefix to struct niobuf_remote members

[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 f85bef7..a56f890 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, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann@whamcloud.com>
@@ -113,11 +113,19 @@ static int osd_acct_index_lookup(const struct lu_env *env,
        struct lquota_acct_rec  *rec = (struct lquota_acct_rec *)dtrec;
        __u64                    id = *((__u64 *)dtkey);
        int                      rc;
+#ifdef HAVE_DQUOT_KQID
+       struct kqid             qid;
+#endif
 
        ENTRY;
 
        memset((void *)dqblk, 0, sizeof(struct obd_dqblk));
+#ifdef HAVE_DQUOT_KQID
+       qid = make_kqid(&init_user_ns, obj2type(dtobj), id);
+       rc = sb->s_qcop->get_dqblk(sb, qid, dqblk);
+#else
        rc = sb->s_qcop->get_dqblk(sb, obj2type(dtobj), (qid_t) id, dqblk);
+#endif
        if (rc)
                RETURN(rc);
 #ifdef HAVE_DQUOT_FS_DISK_QUOTA
@@ -162,7 +170,7 @@ static struct dt_it *osd_it_acct_init(const struct lu_env *env,
        memset(it, 0, sizeof(*it));
        lu_object_get(lo);
        it->oiq_obj = obj;
-       CFS_INIT_LIST_HEAD(&it->oiq_list);
+       INIT_LIST_HEAD(&it->oiq_list);
 
        /* LUSTRE_DQTREEOFF is the initial offset where the tree can be found */
        it->oiq_blk[0] = LUSTRE_DQTREEOFF;
@@ -186,8 +194,8 @@ static void osd_it_acct_fini(const struct lu_env *env, struct dt_it *di)
 
        lu_object_put(env, &it->oiq_obj->oo_dt.do_lu);
 
-       cfs_list_for_each_entry_safe(leaf, tmp, &it->oiq_list, oql_link) {
-               cfs_list_del_init(&leaf->oql_link);
+       list_for_each_entry_safe(leaf, tmp, &it->oiq_list, oql_link) {
+               list_del_init(&leaf->oql_link);
                OBD_FREE_PTR(leaf);
        }
        EXIT;
@@ -254,9 +262,9 @@ static int osd_it_add_processed(struct osd_it_quota *it, int depth)
        OBD_ALLOC_PTR(leaf);
        if (leaf == NULL)
                RETURN(-ENOMEM);
-       CFS_INIT_LIST_HEAD(&leaf->oql_link);
+       INIT_LIST_HEAD(&leaf->oql_link);
        leaf->oql_blk = it->oiq_blk[depth];
-       cfs_list_add_tail(&leaf->oql_link, &it->oiq_list);
+       list_add_tail(&leaf->oql_link, &it->oiq_list);
        RETURN(0);
 }
 
@@ -858,6 +866,7 @@ static int truncate_quota_index(const struct lu_env *env, struct dt_object *dt,
        struct inode            *inode;
        int                      rc;
        struct iam_container    *bag = &(osd_dt_obj(dt))->oo_dir->od_container;
+       struct lu_buf           *lb = &osd_oti_get(env)->oti_buf;
        ENTRY;
 
        LASSERT(bag->ic_root_bh != NULL);
@@ -889,7 +898,9 @@ static int truncate_quota_index(const struct lu_env *env, struct dt_object *dt,
        inode = osd_dt_obj(dt)->oo_inode;
        LASSERT(inode);
 
-       rc = dt_declare_record_write(env, dt, inode->i_sb->s_blocksize * 2, 0, th);
+       /* iam_lfix_create() writes two blocks at the beginning */
+       lb->lb_len = osd_sb(osd)->s_blocksize * 2;
+       rc = dt_declare_record_write(env, dt, lb, 0, th);
        if (rc)
                GOTO(out, rc);