Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / fs / btrfs / raid56.c

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 5394641..8ec34ec 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1104,8 +1104,7 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio,
                 * devices or if they are not contiguous
                 */
                if (last_end == disk_start && !last->bi_status &&
-                   last->bi_disk == stripe->dev->bdev->bd_disk &&
-                   last->bi_partno == stripe->dev->bdev->bd_partno) {
+                   last->bi_bdev == stripe->dev->bdev) {
                        ret = bio_add_page(last, page, PAGE_SIZE, 0);
                        if (ret == PAGE_SIZE)
                                return 0;
@@ -1356,9 +1355,7 @@ static int find_bio_stripe(struct btrfs_raid_bio *rbio,
        for (i = 0; i < rbio->bbio->num_stripes; i++) {
                stripe = &rbio->bbio->stripes[i];
                if (in_range(physical, stripe->physical, rbio->stripe_len) &&
-                   stripe->dev->bdev &&
-                   bio->bi_disk == stripe->dev->bdev->bd_disk &&
-                   bio->bi_partno == stripe->dev->bdev->bd_partno) {
+                   stripe->dev->bdev && bio->bi_bdev == stripe->dev->bdev) {
                        return i;
                }
        }