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 02/16] block: refactor bd_may_claim
Date: Thu, 1 Jun 2023 11:44:45 +0200 [thread overview]
Message-ID: <20230601094459.1350643-3-hch@lst.de> (raw)
In-Reply-To: <20230601094459.1350643-1-hch@lst.de>
The long if/else chain obsfucates the actual logic. Tidy it up to be
more structured. Also drop the whole argument, as it can be trivially
derived from bdev using bdev_whole, and having the bdev_whole in the
function makes it easier to follow.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
---
block/bdev.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/block/bdev.c b/block/bdev.c
index 317bfd9cba40fa..080b5c83bfbc72 100644
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -463,7 +463,6 @@ long nr_blockdev_pages(void)
/**
* bd_may_claim - test whether a block device can be claimed
* @bdev: block device of interest
- * @whole: whole block device containing @bdev, may equal @bdev
* @holder: holder trying to claim @bdev
*
* Test whether @bdev can be claimed by @holder.
@@ -474,22 +473,27 @@ long nr_blockdev_pages(void)
* RETURNS:
* %true if @bdev can be claimed, %false otherwise.
*/
-static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
- void *holder)
+static bool bd_may_claim(struct block_device *bdev, void *holder)
{
- if (bdev->bd_holder == holder)
- return true; /* already a holder */
- else if (bdev->bd_holder != NULL)
- return false; /* held by someone else */
- else if (whole == bdev)
- return true; /* is a whole device which isn't held */
-
- else if (whole->bd_holder == bd_may_claim)
- return true; /* is a partition of a device that is being partitioned */
- else if (whole->bd_holder != NULL)
- return false; /* is a partition of a held device */
- else
- return true; /* is a partition of an un-held device */
+ struct block_device *whole = bdev_whole(bdev);
+
+ if (bdev->bd_holder) {
+ /*
+ * The same holder can always re-claim.
+ */
+ if (bdev->bd_holder == holder)
+ return true;
+ return false;
+ }
+
+ /*
+ * If the whole devices holder is set to bd_may_claim, a partition on
+ * the device is claimed, but not the whole device.
+ */
+ if (whole != bdev &&
+ whole->bd_holder && whole->bd_holder != bd_may_claim)
+ return false;
+ return true;
}
/**
@@ -513,7 +517,7 @@ int bd_prepare_to_claim(struct block_device *bdev, void *holder)
retry:
spin_lock(&bdev_lock);
/* if someone else claimed, fail */
- if (!bd_may_claim(bdev, whole, holder)) {
+ if (!bd_may_claim(bdev, holder)) {
spin_unlock(&bdev_lock);
return -EBUSY;
}
@@ -559,7 +563,7 @@ static void bd_finish_claiming(struct block_device *bdev, void *holder)
struct block_device *whole = bdev_whole(bdev);
spin_lock(&bdev_lock);
- BUG_ON(!bd_may_claim(bdev, whole, holder));
+ BUG_ON(!bd_may_claim(bdev, holder));
/*
* Note that for a whole device bd_holders will be incremented twice,
* and bd_holder will be set to bd_may_claim before being set to holder
--
2.39.2
next prev parent reply other threads:[~2023-06-01 9:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 9:44 introduce bdev holder ops and a file system shutdown method v3 Christoph Hellwig
2023-06-01 9:44 ` [PATCH 01/16] block: factor out a bd_end_claim helper from blkdev_put Christoph Hellwig
2023-06-01 9:44 ` Christoph Hellwig [this message]
2023-06-01 9:44 ` [PATCH 03/16] block: turn bdev_lock into a mutex Christoph Hellwig
2023-06-01 9:44 ` [PATCH 04/16] block: consolidate the shutdown logic in blk_mark_disk_dead and del_gendisk Christoph Hellwig
2023-06-01 9:44 ` [PATCH 05/16] block: avoid repeated work in blk_mark_disk_dead Christoph Hellwig
2023-06-01 9:44 ` [PATCH 06/16] block: unhash the inode earlier in delete_partition Christoph Hellwig
2023-06-01 9:44 ` [PATCH 07/16] block: delete partitions later in del_gendisk Christoph Hellwig
2023-06-01 9:44 ` [PATCH 08/16] block: remove blk_drop_partitions Christoph Hellwig
2023-06-01 9:44 ` [PATCH 09/16] block: introduce holder ops Christoph Hellwig
2023-06-01 9:44 ` [PATCH 10/16] block: add a mark_dead holder operation Christoph Hellwig
2023-06-01 9:44 ` [PATCH 11/16] fs: add a method to shut down the file system Christoph Hellwig
2023-06-01 9:44 ` [PATCH 12/16] xfs: wire up sops->shutdown Christoph Hellwig
2023-06-01 9:44 ` [PATCH 13/16] xfs: wire up the ->mark_dead holder operation for log and RT devices Christoph Hellwig
2023-06-01 9:44 ` [PATCH 14/16] ext4: split ext4_shutdown Christoph Hellwig
2023-06-01 10:10 ` Jan Kara
2023-06-01 9:44 ` [PATCH 15/16] ext4: wire up sops->shutdown Christoph Hellwig
2023-06-01 10:10 ` Jan Kara
2023-06-01 9:44 ` [PATCH 16/16] ext4: wire up the ->mark_dead holder operation for log devices Christoph Hellwig
2023-06-01 10:11 ` Jan Kara
2023-06-01 21:48 ` introduce bdev holder ops and a file system shutdown method v3 Dave Chinner
2023-06-05 17:22 ` 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=20230601094459.1350643-3-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).