]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
md: fix an error code format and remove unsed bio_sector
authorYufen Yu <yuyufen@huawei.com>
Mon, 23 Apr 2018 09:37:30 +0000 (17:37 +0800)
committerShaohua Li <shli@fb.com>
Tue, 1 May 2018 16:47:49 +0000 (09:47 -0700)
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Shaohua Li <shli@fb.com>
drivers/md/raid1.c
drivers/md/raid10.c

index e9e3308cb0a75948e54c135d9b5da2621c073bc6..397b3d80c48b42f1727eeeb40fb8966e36267d4a 100644 (file)
@@ -2450,7 +2450,6 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio)
        struct mddev *mddev = conf->mddev;
        struct bio *bio;
        struct md_rdev *rdev;
-       sector_t bio_sector;
 
        clear_bit(R1BIO_ReadError, &r1_bio->state);
        /* we got a read error. Maybe the drive is bad.  Maybe just
@@ -2463,7 +2462,6 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio)
         */
 
        bio = r1_bio->bios[r1_bio->read_disk];
-       bio_sector = conf->mirrors[r1_bio->read_disk].rdev->data_offset + r1_bio->sector;
        bio_put(bio);
        r1_bio->bios[r1_bio->read_disk] = NULL;
 
index 3c60774c8430c013f0c0372452b70540f4542f43..64300542ab2098d210851cae5a6893f0c67cdd9c 100644 (file)
@@ -2363,7 +2363,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
 {
        int sect = 0; /* Offset from r10_bio->sector */
        int sectors = r10_bio->sectors;
-       struct md_rdev*rdev;
+       struct md_rdev *rdev;
        int max_read_errors = atomic_read(&mddev->max_corr_read_errors);
        int d = r10_bio->devs[r10_bio->read_slot].devnum;