LU-1866 osd: ancillary work for initial OI scrub

[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 acf5557..4e911e3 100644 (file)
--- a/lustre/osd-ldiskfs/osd_quota.c
+++ b/lustre/osd-ldiskfs/osd_quota.c
@@ -511,9 +511,9 @@ int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh,
                        RETURN(-EOVERFLOW);
                }
 
-               OSD_DECLARE_OP(oh, quota,
-                              (allocated || qi->lqi_id.qid_uid == 0) ?
-                              1 : LDISKFS_QUOTA_INIT_BLOCKS(osd_sb(dev)));
+               osd_trans_declare_op(env, oh, OSD_OT_QUOTA,
+                                    (allocated || qi->lqi_id.qid_uid == 0) ?
+                                    1: LDISKFS_QUOTA_INIT_BLOCKS(osd_sb(dev)));
 
                oh->ot_id_array[i] = qi->lqi_id.qid_uid;
                osd_qid_set_type(oh, i, qi->lqi_type);
@@ -933,10 +933,6 @@ out:
        RETURN(rc);
 }
 
-#define OBJECTS                "OBJECTS"
-#define ADMIN_USR      "admin_quotafile_v2.usr"
-#define ADMIN_GRP      "admin_quotafile_v2.grp"
-
 int osd_quota_migration(const struct lu_env *env, struct dt_object *dt,
                        const struct dt_index_features *feat)
 {