summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYufen Yu <yuyufen@huawei.com>2018-04-23 17:37:30 +0800
committerShaohua Li <shli@fb.com>2018-05-01 09:47:49 -0700
commit13db16d74c02c0e9b2d0dc9b9773c8e58ad41064 (patch)
treef29b1c76106f11f5a5d759b81b339d9c35556c5c
parent83beed7b2b26f232d782127792dd0cd4362fdc41 (diff)
downloadtalos-obmc-linux-13db16d74c02c0e9b2d0dc9b9773c8e58ad41064.tar.gz
talos-obmc-linux-13db16d74c02c0e9b2d0dc9b9773c8e58ad41064.zip
md: fix an error code format and remove unsed bio_sector
Signed-off-by: Yufen Yu <yuyufen@huawei.com> Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r--drivers/md/raid1.c2
-rw-r--r--drivers/md/raid10.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e9e3308cb0a7..397b3d80c48b 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -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;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 3c60774c8430..64300542ab20 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -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;
OpenPOWER on IntegriCloud