Skip to content

Commit 14d57ec

Browse files
Dan Carpenteraxboe
Dan Carpenter
authored andcommitted
blk_iocost: remove some duplicate irq disable/enables
These are called from blkcg_print_blkgs() which already disables IRQs so disabling it again is wrong. It means that IRQs will be enabled slightly earlier than intended, however, so far as I can see, this bug is harmless. Fixes: 35198e3 ("blk-iocost: read params inside lock in sysfs apis") Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 0ab4284 commit 14d57ec

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

block/blk-iocost.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3166,7 +3166,7 @@ static u64 ioc_qos_prfill(struct seq_file *sf, struct blkg_policy_data *pd,
31663166
if (!dname)
31673167
return 0;
31683168

3169-
spin_lock_irq(&ioc->lock);
3169+
spin_lock(&ioc->lock);
31703170
seq_printf(sf, "%s enable=%d ctrl=%s rpct=%u.%02u rlat=%u wpct=%u.%02u wlat=%u min=%u.%02u max=%u.%02u\n",
31713171
dname, ioc->enabled, ioc->user_qos_params ? "user" : "auto",
31723172
ioc->params.qos[QOS_RPPM] / 10000,
@@ -3179,7 +3179,7 @@ static u64 ioc_qos_prfill(struct seq_file *sf, struct blkg_policy_data *pd,
31793179
ioc->params.qos[QOS_MIN] % 10000 / 100,
31803180
ioc->params.qos[QOS_MAX] / 10000,
31813181
ioc->params.qos[QOS_MAX] % 10000 / 100);
3182-
spin_unlock_irq(&ioc->lock);
3182+
spin_unlock(&ioc->lock);
31833183
return 0;
31843184
}
31853185

@@ -3366,14 +3366,14 @@ static u64 ioc_cost_model_prfill(struct seq_file *sf,
33663366
if (!dname)
33673367
return 0;
33683368

3369-
spin_lock_irq(&ioc->lock);
3369+
spin_lock(&ioc->lock);
33703370
seq_printf(sf, "%s ctrl=%s model=linear "
33713371
"rbps=%llu rseqiops=%llu rrandiops=%llu "
33723372
"wbps=%llu wseqiops=%llu wrandiops=%llu\n",
33733373
dname, ioc->user_cost_model ? "user" : "auto",
33743374
u[I_LCOEF_RBPS], u[I_LCOEF_RSEQIOPS], u[I_LCOEF_RRANDIOPS],
33753375
u[I_LCOEF_WBPS], u[I_LCOEF_WSEQIOPS], u[I_LCOEF_WRANDIOPS]);
3376-
spin_unlock_irq(&ioc->lock);
3376+
spin_unlock(&ioc->lock);
33773377
return 0;
33783378
}
33793379

0 commit comments

Comments
 (0)