From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
"Darrick J. Wong" <djwong@kernel.org>, Jan Kara <jack@suse.cz>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-xfs@vger.kernel.org
Subject: [PATCH 08/13] block: remove blk_drop_partitions
Date: Thu, 18 May 2023 06:23:17 +0200 [thread overview]
Message-ID: <20230518042323.663189-9-hch@lst.de> (raw)
In-Reply-To: <20230518042323.663189-1-hch@lst.de>
There is only a single caller left, so fold the loop into that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/partitions/core.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/block/partitions/core.c b/block/partitions/core.c
index 31ac815d77a83c..2559bb830273eb 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -524,17 +524,6 @@ static bool disk_unlock_native_capacity(struct gendisk *disk)
return true;
}
-static void blk_drop_partitions(struct gendisk *disk)
-{
- struct block_device *part;
- unsigned long idx;
-
- lockdep_assert_held(&disk->open_mutex);
-
- xa_for_each_start(&disk->part_tbl, idx, part, 1)
- delete_partition(part);
-}
-
static bool blk_add_partition(struct gendisk *disk,
struct parsed_partitions *state, int p)
{
@@ -651,6 +640,8 @@ static int blk_add_partitions(struct gendisk *disk)
int bdev_disk_changed(struct gendisk *disk, bool invalidate)
{
+ struct block_device *part;
+ unsigned long idx;
int ret = 0;
lockdep_assert_held(&disk->open_mutex);
@@ -663,8 +654,9 @@ int bdev_disk_changed(struct gendisk *disk, bool invalidate)
return -EBUSY;
sync_blockdev(disk->part0);
invalidate_bdev(disk->part0);
- blk_drop_partitions(disk);
+ xa_for_each_start(&disk->part_tbl, idx, part, 1)
+ delete_partition(part);
clear_bit(GD_NEED_PART_SCAN, &disk->state);
/*
--
2.39.2
next prev parent reply other threads:[~2023-05-18 4:23 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 4:23 introduce bdev holder ops and a file system shutdown method v2 Christoph Hellwig
2023-05-18 4:23 ` [PATCH 01/13] block: factor out a bd_end_claim helper from blkdev_put Christoph Hellwig
2023-05-18 4:23 ` [PATCH 02/13] block: refactor bd_may_claim Christoph Hellwig
2023-05-30 11:41 ` Jan Kara
2023-06-01 8:11 ` Christoph Hellwig
2023-06-01 9:58 ` Jan Kara
2023-05-18 4:23 ` [PATCH 03/13] block: turn bdev_lock into a mutex Christoph Hellwig
2023-05-18 4:23 ` [PATCH 04/13] block: consolidate the shutdown logic in blk_mark_disk_dead and del_gendisk Christoph Hellwig
2023-05-30 11:58 ` Jan Kara
2023-05-18 4:23 ` [PATCH 05/13] block: avoid repeated work in blk_mark_disk_dead Christoph Hellwig
2023-05-18 4:23 ` [PATCH 06/13] block: unhash the inode earlier in delete_partition Christoph Hellwig
2023-05-30 12:09 ` Jan Kara
2023-05-18 4:23 ` [PATCH 07/13] block: delete partitions later in del_gendisk Christoph Hellwig
2023-05-30 12:55 ` Jan Kara
2023-05-18 4:23 ` Christoph Hellwig [this message]
2023-05-30 12:56 ` [PATCH 08/13] block: remove blk_drop_partitions Jan Kara
2023-05-18 4:23 ` [PATCH 09/13] block: introduce holder ops Christoph Hellwig
2023-05-30 13:03 ` Jan Kara
2023-05-18 4:23 ` [PATCH 10/13] block: add a mark_dead holder operation Christoph Hellwig
2023-05-30 13:05 ` Jan Kara
2023-05-18 4:23 ` [PATCH 11/13] fs: add a method to shut down the file system Christoph Hellwig
2023-05-18 4:23 ` [PATCH 12/13] xfs: wire up sops->shutdown Christoph Hellwig
2023-05-18 5:03 ` Darrick J. Wong
2023-05-18 4:23 ` [PATCH 13/13] xfs: wire up the ->mark_dead holder operation for log and RT devices Christoph Hellwig
2023-05-18 5:40 ` Dave Chinner
2023-05-19 2:00 ` introduce bdev holder ops and a file system shutdown method v2 Theodore Ts'o
2023-05-19 4:11 ` Christoph Hellwig
2023-05-23 0:58 ` Darrick J. Wong
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=20230518042323.663189-9-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=djwong@kernel.org \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).