diff options
| author |   Baolin Wang <baolin.wang@linux.alibaba.com> | 2020-10-08 11:52:26 +0800 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-10-08 08:01:38 -0600 |
| commit | b7b609de5a0835b2ca10c71df5d9570008eb1084 (patch) | |
| tree | 05fa0c7b2629cea869a1ff29a86a0d53ec0279b4 /block/blk-throttle.c | |
| parent | blk-throttle: Fix IO hang for a corner case (diff) | |
| download | linux-dev-b7b609de5a0835b2ca10c71df5d9570008eb1084.tar.xz linux-dev-b7b609de5a0835b2ca10c71df5d9570008eb1084.zip | |
blk-throttle: Move the list operation after list validation
We should move the list operation after validation.
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-throttle.c')
| -rw-r--r-- | block/blk-throttle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 0649bceebf35..f1bcb5c320e8 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -423,12 +423,13 @@ static void throtl_qnode_add_bio(struct bio *bio, struct throtl_qnode *qn, */ static struct bio *throtl_peek_queued(struct list_head *queued) { - struct throtl_qnode *qn = list_first_entry(queued, struct throtl_qnode, node); + struct throtl_qnode *qn; struct bio *bio; if (list_empty(queued)) return NULL; + qn = list_first_entry(queued, struct throtl_qnode, node); bio = bio_list_peek(&qn->bios); WARN_ON_ONCE(!bio); return bio; @@ -451,12 +452,13 @@ static struct bio *throtl_peek_queued(struct list_head *queued) static struct bio *throtl_pop_queued(struct list_head *queued, struct throtl_grp **tg_to_put) { - struct throtl_qnode *qn = list_first_entry(queued, struct throtl_qnode, node); + struct throtl_qnode *qn; struct bio *bio; if (list_empty(queued)) return NULL; + qn = list_first_entry(queued, struct throtl_qnode, node); bio = bio_list_pop(&qn->bios); WARN_ON_ONCE(!bio); |