author: Ming Lei <ming.lei@redhat.com> 2020-12-21 12:33:35 +0800
committer: Jens Axboe <axboe@kernel.dk> 2021-01-05 11:35:17 -0700
commit: aebf5db917055b38f4945ed6d621d9f07a44ff30
parent: 6d4d273588378c65915acaf7b2ee74e9dd9c130a
Commit Summary:
Diffstat:
1 file changed, 7 insertions, 4 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 73faec438e49..419548e92d82 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -246,15 +246,18 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter)
part = rcu_dereference(ptbl->part[piter->idx]);
if (!part)
continue;
+ piter->part = bdgrab(part);
+ if (!piter->part)
+ continue;
if (!bdev_nr_sectors(part) &&
!(piter->flags & DISK_PITER_INCL_EMPTY) &&
!(piter->flags & DISK_PITER_INCL_EMPTY_PART0 &&
- piter->idx == 0))
+ piter->idx == 0)) {
+ bdput(piter->part);
+ piter->part = NULL;
continue;
+ }
- piter->part = bdgrab(part);
- if (!piter->part)
- continue;
piter->idx += inc;
break;
}