From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: dm-devel@redhat.com, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
drbd-dev@lists.linbit.com, linux-ide@vger.kernel.org,
linux-raid@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org,
target-devel@vger.kernel.org
Subject: [PATCH 3/9] md: compare bd_disk instead of bd_contains
Date: Thu, 3 Sep 2020 07:40:58 +0200 [thread overview]
Message-ID: <20200903054104.228829-4-hch@lst.de> (raw)
In-Reply-To: <20200903054104.228829-1-hch@lst.de>
To check for partitions of the same disk bd_contains works as well, but
bd_disk is way more obvious.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/md/md.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9562ef598ae1f4..3f33562d10d6f5 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2322,8 +2322,7 @@ static int match_mddev_units(struct mddev *mddev1, struct mddev *mddev2)
test_bit(Journal, &rdev2->flags) ||
rdev2->raid_disk == -1)
continue;
- if (rdev->bdev->bd_contains ==
- rdev2->bdev->bd_contains) {
+ if (rdev->bdev->bd_disk == rdev2->bdev->bd_disk) {
rcu_read_unlock();
return 1;
}
@@ -5944,8 +5943,8 @@ int md_run(struct mddev *mddev)
rdev_for_each(rdev, mddev)
rdev_for_each(rdev2, mddev) {
if (rdev < rdev2 &&
- rdev->bdev->bd_contains ==
- rdev2->bdev->bd_contains) {
+ rdev->bdev->bd_disk ==
+ rdev2->bdev->bd_disk) {
pr_warn("%s: WARNING: %s appears to be on the same physical disk as %s.\n",
mdname(mddev),
bdevname(rdev->bdev,b),
--
2.28.0
next prev parent reply other threads:[~2020-09-03 5:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 5:40 clean up is partition checks Christoph Hellwig
2020-09-03 5:40 ` [PATCH 1/9] Documentation/hdio: fix up obscure bd_contains references Christoph Hellwig
2020-09-03 5:40 ` [PATCH 2/9] block: add a bdev_is_partition helper Christoph Hellwig
2020-09-03 8:19 ` Ulf Hansson
2020-09-03 8:26 ` Christoph Hellwig
2020-09-03 5:40 ` Christoph Hellwig [this message]
2020-09-09 0:55 ` [PATCH 3/9] md: compare bd_disk instead of bd_contains Song Liu
2020-09-03 5:40 ` [PATCH 4/9] md: don't detour through bd_contains for the gendisk Christoph Hellwig
2020-09-09 0:55 ` Song Liu
2020-09-03 5:41 ` [PATCH 5/9] drbd: " Christoph Hellwig
2020-09-03 5:41 ` [PATCH 6/9] drbd: don't set ->bd_contains Christoph Hellwig
2020-09-03 5:41 ` [PATCH 7/9] target/iblock: fix holder printing in iblock_show_configfs_dev_params Christoph Hellwig
2020-09-03 5:41 ` [PATCH 8/9] block: use bd_partno in bdevname Christoph Hellwig
2020-09-03 5:41 ` [PATCH 9/9] vsprintf: use bd_partno in bdev_name Christoph Hellwig
2020-09-15 5:45 ` clean up is partition checks Christoph Hellwig
2020-09-25 14:19 ` 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=20200903054104.228829-4-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=target-devel@vger.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: 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).