From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Tejun Heo <tj@kernel.org>, Coly Li <colyli@suse.de>, Song Liu <song@kernel.org>, dm-devel@redhat.com, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-s390@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH 09/10] block: remove DISK_PITER_REVERSE Date: Sun, 24 Jan 2021 11:02:40 +0100 [thread overview] Message-ID: <20210124100241.1167849-10-hch@lst.de> (raw) In-Reply-To: <20210124100241.1167849-1-hch@lst.de> There is good reason to iterate backwards when deleting all partitions in del_gendisk, just like we don't in blk_drop_partitions. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Tejun Heo <tj@kernel.org> --- block/genhd.c | 37 +++++++------------------------------ include/linux/genhd.h | 1 - 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index 7094612c7510a8..1832add5c73849 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -184,24 +184,13 @@ static struct block_device *__disk_get_part(struct gendisk *disk, int partno) void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk, unsigned int flags) { - struct disk_part_tbl *ptbl; - - rcu_read_lock(); - ptbl = rcu_dereference(disk->part_tbl); - piter->disk = disk; piter->part = NULL; - - if (flags & DISK_PITER_REVERSE) - piter->idx = ptbl->len - 1; - else if (flags & (DISK_PITER_INCL_PART0 | DISK_PITER_INCL_EMPTY_PART0)) + if (flags & (DISK_PITER_INCL_PART0 | DISK_PITER_INCL_EMPTY_PART0)) piter->idx = 0; else piter->idx = 1; - piter->flags = flags; - - rcu_read_unlock(); } /** @@ -216,7 +205,6 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk, struct block_device *disk_part_iter_next(struct disk_part_iter *piter) { struct disk_part_tbl *ptbl; - int inc, end; /* put the last partition */ disk_part_iter_exit(piter); @@ -225,21 +213,8 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter) rcu_read_lock(); ptbl = rcu_dereference(piter->disk->part_tbl); - /* determine iteration parameters */ - if (piter->flags & DISK_PITER_REVERSE) { - inc = -1; - if (piter->flags & (DISK_PITER_INCL_PART0 | - DISK_PITER_INCL_EMPTY_PART0)) - end = -1; - else - end = 0; - } else { - inc = 1; - end = ptbl->len; - } - /* iterate to the next partition */ - for (; piter->idx != end; piter->idx += inc) { + for (; piter->idx != ptbl->len; piter->idx += 1) { struct block_device *part; part = rcu_dereference(ptbl->part[piter->idx]); @@ -257,7 +232,10 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter) continue; } - piter->idx += inc; + piter->part = bdgrab(part); + if (!piter->part) + continue; + piter->idx += 1; break; } @@ -781,8 +759,7 @@ void del_gendisk(struct gendisk *disk) down_write(&bdev_lookup_sem); /* invalidate stuff */ - disk_part_iter_init(&piter, disk, - DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE); + disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); while ((part = disk_part_iter_next(&piter))) { invalidate_partition(part); delete_partition(part); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 670eaef0e87622..51609133c9a347 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -218,7 +218,6 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action); /* * Smarter partition iterator without context limits. */ -#define DISK_PITER_REVERSE (1 << 0) /* iterate in the reverse direction */ #define DISK_PITER_INCL_EMPTY (1 << 1) /* include 0-sized parts */ #define DISK_PITER_INCL_PART0 (1 << 2) /* include partition 0 */ #define DISK_PITER_INCL_EMPTY_PART0 (1 << 3) /* include empty partition 0 */ -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: linux-s390@vger.kernel.org, linux-bcache@vger.kernel.org, Coly Li <colyli@suse.de>, linux-raid@vger.kernel.org, Song Liu <song@kernel.org>, dm-devel@redhat.com, linux-block@vger.kernel.org, Tejun Heo <tj@kernel.org> Subject: [dm-devel] [PATCH 09/10] block: remove DISK_PITER_REVERSE Date: Sun, 24 Jan 2021 11:02:40 +0100 [thread overview] Message-ID: <20210124100241.1167849-10-hch@lst.de> (raw) In-Reply-To: <20210124100241.1167849-1-hch@lst.de> There is good reason to iterate backwards when deleting all partitions in del_gendisk, just like we don't in blk_drop_partitions. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Tejun Heo <tj@kernel.org> --- block/genhd.c | 37 +++++++------------------------------ include/linux/genhd.h | 1 - 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index 7094612c7510a8..1832add5c73849 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -184,24 +184,13 @@ static struct block_device *__disk_get_part(struct gendisk *disk, int partno) void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk, unsigned int flags) { - struct disk_part_tbl *ptbl; - - rcu_read_lock(); - ptbl = rcu_dereference(disk->part_tbl); - piter->disk = disk; piter->part = NULL; - - if (flags & DISK_PITER_REVERSE) - piter->idx = ptbl->len - 1; - else if (flags & (DISK_PITER_INCL_PART0 | DISK_PITER_INCL_EMPTY_PART0)) + if (flags & (DISK_PITER_INCL_PART0 | DISK_PITER_INCL_EMPTY_PART0)) piter->idx = 0; else piter->idx = 1; - piter->flags = flags; - - rcu_read_unlock(); } /** @@ -216,7 +205,6 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk, struct block_device *disk_part_iter_next(struct disk_part_iter *piter) { struct disk_part_tbl *ptbl; - int inc, end; /* put the last partition */ disk_part_iter_exit(piter); @@ -225,21 +213,8 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter) rcu_read_lock(); ptbl = rcu_dereference(piter->disk->part_tbl); - /* determine iteration parameters */ - if (piter->flags & DISK_PITER_REVERSE) { - inc = -1; - if (piter->flags & (DISK_PITER_INCL_PART0 | - DISK_PITER_INCL_EMPTY_PART0)) - end = -1; - else - end = 0; - } else { - inc = 1; - end = ptbl->len; - } - /* iterate to the next partition */ - for (; piter->idx != end; piter->idx += inc) { + for (; piter->idx != ptbl->len; piter->idx += 1) { struct block_device *part; part = rcu_dereference(ptbl->part[piter->idx]); @@ -257,7 +232,10 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter) continue; } - piter->idx += inc; + piter->part = bdgrab(part); + if (!piter->part) + continue; + piter->idx += 1; break; } @@ -781,8 +759,7 @@ void del_gendisk(struct gendisk *disk) down_write(&bdev_lookup_sem); /* invalidate stuff */ - disk_part_iter_init(&piter, disk, - DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE); + disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); while ((part = disk_part_iter_next(&piter))) { invalidate_partition(part); delete_partition(part); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 670eaef0e87622..51609133c9a347 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -218,7 +218,6 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action); /* * Smarter partition iterator without context limits. */ -#define DISK_PITER_REVERSE (1 << 0) /* iterate in the reverse direction */ #define DISK_PITER_INCL_EMPTY (1 << 1) /* include 0-sized parts */ #define DISK_PITER_INCL_PART0 (1 << 2) /* include partition 0 */ #define DISK_PITER_INCL_EMPTY_PART0 (1 << 3) /* include empty partition 0 */ -- 2.29.2 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2021-01-24 10:08 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-24 10:02 store a pointer to the block_device in struct bio (again) v2 Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-24 10:02 ` [PATCH 01/10] brd: remove the end of device check in brd_do_bvec Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-25 13:51 ` Johannes Thumshirn 2021-01-25 13:51 ` [dm-devel] " Johannes Thumshirn 2021-01-24 10:02 ` [PATCH 02/10] dcssblk: remove the end of device check in dcssblk_submit_bio Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-25 13:52 ` Johannes Thumshirn 2021-01-25 13:52 ` [dm-devel] " Johannes Thumshirn 2021-01-24 10:02 ` [PATCH 03/10] block: store a block_device pointer in struct bio Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-24 10:02 ` [PATCH 04/10] block: simplify submit_bio_checks a bit Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-25 14:02 ` Johannes Thumshirn 2021-01-25 14:02 ` [dm-devel] " Johannes Thumshirn 2021-01-24 10:02 ` [PATCH 05/10] block: do not reassig ->bi_bdev when partition remapping Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-25 17:53 ` Jens Axboe 2021-01-25 17:53 ` [dm-devel] " Jens Axboe 2021-01-25 17:53 ` Jens Axboe 2021-01-25 17:55 ` Christoph Hellwig 2021-01-25 17:55 ` [dm-devel] " Christoph Hellwig 2021-01-25 17:55 ` Christoph Hellwig 2021-01-25 17:57 ` [dm-devel] " Jens Axboe 2021-01-25 18:03 ` Jens Axboe 2021-01-25 18:03 ` [dm-devel] " Jens Axboe 2021-01-25 18:03 ` Jens Axboe 2021-01-25 18:13 ` Christoph Hellwig 2021-01-25 18:13 ` [dm-devel] " Christoph Hellwig 2021-01-25 18:13 ` Christoph Hellwig 2021-01-25 18:15 ` Jens Axboe 2021-01-25 18:15 ` [dm-devel] " Jens Axboe 2021-01-25 18:15 ` Jens Axboe 2021-01-25 18:18 ` Christoph Hellwig 2021-01-25 18:18 ` [dm-devel] " Christoph Hellwig 2021-01-25 18:18 ` Christoph Hellwig 2021-01-25 18:19 ` Jens Axboe 2021-01-25 18:19 ` [dm-devel] " Jens Axboe 2021-01-25 18:19 ` Jens Axboe 2021-01-25 18:21 ` Christoph Hellwig 2021-01-25 18:21 ` [dm-devel] " Christoph Hellwig 2021-01-25 18:21 ` Christoph Hellwig 2021-01-25 18:31 ` Jens Axboe 2021-01-25 18:31 ` [dm-devel] " Jens Axboe 2021-01-25 18:31 ` Jens Axboe 2021-01-24 10:02 ` [PATCH 06/10] block: use ->bi_bdev for bio based I/O accounting Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-24 10:02 ` [PATCH 07/10] blk-mq: use ->bi_bdev for " Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-24 10:02 ` [PATCH 08/10] block: add a disk_uevent helper Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-25 14:14 ` Johannes Thumshirn 2021-01-25 14:14 ` [dm-devel] " Johannes Thumshirn 2021-01-24 10:02 ` Christoph Hellwig [this message] 2021-01-24 10:02 ` [dm-devel] [PATCH 09/10] block: remove DISK_PITER_REVERSE Christoph Hellwig 2021-01-24 10:02 ` [PATCH 10/10] block: use an xarray for disk->part_tbl Christoph Hellwig 2021-01-24 10:02 ` [dm-devel] " Christoph Hellwig 2021-01-25 16:24 ` store a pointer to the block_device in struct bio (again) v2 Jens Axboe 2021-01-25 16:24 ` [dm-devel] " Jens Axboe
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210124100241.1167849-10-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=colyli@suse.de \ --cc=dm-devel@redhat.com \ --cc=linux-bcache@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-raid@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=song@kernel.org \ --cc=tj@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.