[lustre-devel] [PATCH 15/29] lustre: lmv: don't include struct lu_qos_rr in client
James Simmons
jsimmons at infradead.org
Sun Apr 25 13:08:22 PDT 2021
From: Mr NeilBrown <neilb at suse.de>
The 'lqrr' field in 'struct lu_qos' is not used on the client (lmv).
So make it server-only for use in lod. We can safely remove it from
the Linux client.
WC-bug-id: https://jira.whamcloud.com/browse/LU-8837
Lustre-commit: b6882c8ae4f47e93 ("LU-8837 lmv: don't include struct lu_qos_rr in client")
Signed-off-by: Mr NeilBrown <neilb at suse.de>
Reviewed-on: https://review.whamcloud.com/41950
Reviewed-by: Lai Siyao <lai.siyao at whamcloud.com>
Reviewed-by: Andreas Dilger <adilger at whamcloud.com>
Reviewed-by: Oleg Drokin <green at whamcloud.com>
Signed-off-by: James Simmons <jsimmons at infradead.org>
---
fs/lustre/include/lu_object.h | 22 +++++-----------------
fs/lustre/obdclass/lu_tgt_descs.c | 11 -----------
2 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/fs/lustre/include/lu_object.h b/fs/lustre/include/lu_object.h
index 75bb6c3..0aa28c7 100644
--- a/fs/lustre/include/lu_object.h
+++ b/fs/lustre/include/lu_object.h
@@ -1413,16 +1413,6 @@ enum lq_flag {
LQ_RESET, /* zero current penalties */
};
-/* round-robin QoS data for LOD/LMV */
-struct lu_qos_rr {
- spinlock_t lqr_alloc; /* protect allocation index */
- u32 lqr_start_idx; /* start index of new inode */
- u32 lqr_offset_idx;/* aliasing for start_idx */
- int lqr_start_count;/* reseed counter */
- struct lu_tgt_pool lqr_pool; /* round-robin optimized list */
- unsigned long lqr_flags;
-};
-
/* QoS data per MDS/OSS */
struct lu_svr_qos {
struct obd_uuid lsq_uuid; /* ptlrpc's c_remote_uuid */
@@ -1484,12 +1474,11 @@ struct lu_tgt_desc_idx {
/* QoS data for LOD/LMV */
struct lu_qos {
- struct list_head lq_svr_list; /* lu_svr_qos list */
- struct rw_semaphore lq_rw_sem;
- u32 lq_active_svr_count;
- unsigned int lq_prio_free; /* priority for free space */
- unsigned int lq_threshold_rr;/* priority for rr */
- struct lu_qos_rr lq_rr; /* round robin qos data */
+ struct list_head lq_svr_list; /* lu_svr_qos list */
+ struct rw_semaphore lq_rw_sem;
+ u32 lq_active_svr_count;
+ unsigned int lq_prio_free; /* priority for free space */
+ unsigned int lq_threshold_rr;/* priority for rr */
unsigned long lq_flags;
};
@@ -1525,7 +1514,6 @@ struct lu_tgt_descs {
ldi_tgt[(index) % TGT_PTRS_PER_BLOCK]
u64 lu_prandom_u64_max(u64 ep_ro);
-void lu_qos_rr_init(struct lu_qos_rr *lqr);
int lu_qos_add_tgt(struct lu_qos *qos, struct lu_tgt_desc *ltd);
void lu_tgt_qos_weight_calc(struct lu_tgt_desc *tgt);
diff --git a/fs/lustre/obdclass/lu_tgt_descs.c b/fs/lustre/obdclass/lu_tgt_descs.c
index ef30ee3..cb62ce4 100644
--- a/fs/lustre/obdclass/lu_tgt_descs.c
+++ b/fs/lustre/obdclass/lu_tgt_descs.c
@@ -77,13 +77,6 @@ u64 lu_prandom_u64_max(u64 ep_ro)
}
EXPORT_SYMBOL(lu_prandom_u64_max);
-void lu_qos_rr_init(struct lu_qos_rr *lqr)
-{
- spin_lock_init(&lqr->lqr_alloc);
- set_bit(LQ_DIRTY, &lqr->lqr_flags);
-}
-EXPORT_SYMBOL(lu_qos_rr_init);
-
/**
* Add a new target to Quality of Service (QoS) target table.
*
@@ -159,7 +152,6 @@ int lu_qos_add_tgt(struct lu_qos *qos, struct lu_tgt_desc *tgt)
list_add_tail(&svr->lsq_svr_list, &tempsvr->lsq_svr_list);
set_bit(LQ_DIRTY, &qos->lq_flags);
- set_bit(LQ_DIRTY, &qos->lq_rr.lqr_flags);
out:
up_write(&qos->lq_rw_sem);
return rc;
@@ -200,7 +192,6 @@ static int lu_qos_del_tgt(struct lu_qos *qos, struct lu_tgt_desc *ltd)
}
set_bit(LQ_DIRTY, &qos->lq_flags);
- set_bit(LQ_DIRTY, &qos->lq_rr.lqr_flags);
out:
up_write(&qos->lq_rw_sem);
return rc;
@@ -282,8 +273,6 @@ int lu_tgt_descs_init(struct lu_tgt_descs *ltd, bool is_mdt)
if (is_mdt)
ltd->ltd_lmv_desc.ld_pattern = LMV_HASH_TYPE_DEFAULT;
- lu_qos_rr_init(<d->ltd_qos.lq_rr);
-
return 0;
}
EXPORT_SYMBOL(lu_tgt_descs_init);
--
1.8.3.1
More information about the lustre-devel
mailing list