LU-12538 lod: Add missed qos_rr_init

[fs/lustre-release.git] / lustre / lmv / lmv_obd.c

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 3d73e22..4cd844f 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -1199,7 +1199,7 @@ static u32 lmv_placement_policy(struct obd_device *obd,
                mdt = le32_to_cpu(lum->lum_stripe_offset);
        } else if (op_data->op_code == LUSTRE_OPC_MKDIR &&
                   !lmv_dir_striped(op_data->op_mea1) &&
-                  lmv_dir_space_hashed(op_data->op_default_mea1)) {
+                  lmv_dir_qos_mkdir(op_data->op_default_mea1)) {
                mdt = op_data->op_mds;
        } else if (op_data->op_code == LUSTRE_OPC_MKDIR &&
                   op_data->op_default_mea1 &&
@@ -1311,13 +1311,14 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
        INIT_LIST_HEAD(&lmv->lmv_qos.lq_svr_list);
        init_rwsem(&lmv->lmv_qos.lq_rw_sem);
        lmv->lmv_qos.lq_dirty = 1;
-       lmv->lmv_qos.lq_rr.lqr_dirty = 1;
        lmv->lmv_qos.lq_reset = 1;
        /* Default priority is toward free space balance */
        lmv->lmv_qos.lq_prio_free = 232;
        /* Default threshold for rr (roughly 17%) */
        lmv->lmv_qos.lq_threshold_rr = 43;
 
+       lu_qos_rr_init(&lmv->lmv_qos.lq_rr);
+
        /*
         * initialize rr_index to lower 32bit of netid, so that client
         * can distribute subdirs evenly from the beginning.
@@ -1744,7 +1745,7 @@ lmv_locate_tgt(struct lmv_obd *lmv, struct md_op_data *op_data)
                op_data->op_mds = oinfo->lmo_mds;
                tgt = lmv_get_target(lmv, oinfo->lmo_mds, NULL);
        } else if (op_data->op_code == LUSTRE_OPC_MKDIR &&
-                  lmv_dir_space_hashed(op_data->op_default_mea1) &&
+                  lmv_dir_qos_mkdir(op_data->op_default_mea1) &&
                   !lmv_dir_striped(lsm)) {
                tgt = lmv_locate_tgt_qos(lmv, &op_data->op_mds);
                if (tgt == ERR_PTR(-EAGAIN))
@@ -3550,6 +3551,7 @@ struct obd_ops lmv_obd_ops = {
         .o_set_info_async       = lmv_set_info_async,
         .o_notify               = lmv_notify,
         .o_get_uuid             = lmv_get_uuid,
+       .o_fid_alloc            = lmv_fid_alloc,
         .o_iocontrol            = lmv_iocontrol,
         .o_quotactl             = lmv_quotactl
 };