linux-kernel - Re: [PATCH 3/9] md: compare bd_disk instead of bd

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 8 Sep 2020 17:55:29 -0700
From:   Song Liu <song@...nel.org>
To:     Christoph Hellwig <hch@....de>
Cc:     Jens Axboe <axboe@...nel.dk>, dm-devel@...hat.com,
        Linux Doc Mailing List <linux-doc@...r.kernel.org>,
        open list <linux-kernel@...r.kernel.org>,
        linux-block@...r.kernel.org, drbd-dev@...ts.linbit.com,
        linux-ide@...r.kernel.org, linux-raid <linux-raid@...r.kernel.org>,
        linux-mmc@...r.kernel.org, linux-s390@...r.kernel.org,
        linux-scsi@...r.kernel.org, target-devel@...r.kernel.org
Subject: Re: [PATCH 3/9] md: compare bd_disk instead of bd_contains

On Wed, Sep 2, 2020 at 10:43 PM Christoph Hellwig <hch@....de> wrote:
>
> 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@....de>

Acked-by: Song Liu <song@...nel.org>

> ---
>  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
>