block: replace bi_bdev with a gendisk pointer and partitions index

[mirror_ubuntu-bionic-kernel.git] / kernel / power / swap.c

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 57d22571f3068bdecf36a3ac0f8d8566d5f7c455..d7cdc426ee3809bbaafdfd9d5698f83db654e23a 100644 (file)
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -242,8 +242,7 @@ static void hib_end_io(struct bio *bio)
 
        if (bio->bi_status) {
                printk(KERN_ALERT "Read-error on swap-device (%u:%u:%Lu)\n",
-                               imajor(bio->bi_bdev->bd_inode),
-                               iminor(bio->bi_bdev->bd_inode),
+                               MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)),
                                (unsigned long long)bio->bi_iter.bi_sector);
        }
 
@@ -270,7 +269,7 @@ static int hib_submit_io(int op, int op_flags, pgoff_t page_off, void *addr,
 
        bio = bio_alloc(__GFP_RECLAIM | __GFP_HIGH, 1);
        bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9);
-       bio->bi_bdev = hib_resume_bdev;
+       bio_set_dev(bio, hib_resume_bdev);
        bio_set_op_attrs(bio, op, op_flags);
 
        if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {