diff options
| author | NeilBrown <neilb@suse.com> | 2016-06-02 08:19:52 +0200 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2016-06-13 20:54:16 +0200 |
| commit | 4056ca51a2ed2eb22fd2fa9b0400b1dcaf78a6b5 (patch) | |
| tree | 5d4608a775955d345e5888eb5d09ee66fa361879 | |
| parent | md/raid10: minor code improvement in fix_read_error() (diff) | |
| download | linux-4056ca51a2ed2eb22fd2fa9b0400b1dcaf78a6b5.tar.xz linux-4056ca51a2ed2eb22fd2fa9b0400b1dcaf78a6b5.zip | |
md/raid10: simplify print_conf a little.
'tmp' is only ever used to extract 'tmp->rdev', so just use 'rdev' directly.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
| -rw-r--r-- | drivers/md/raid10.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 7a8bfe2196c9..526c1d82246e 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1598,7 +1598,7 @@ static void raid10_error(struct mddev *mddev, struct md_rdev *rdev) static void print_conf(struct r10conf *conf) { int i; - struct raid10_info *tmp; + struct md_rdev *rdev; printk(KERN_DEBUG "RAID10 conf printout:\n"); if (!conf) { @@ -1608,14 +1608,16 @@ static void print_conf(struct r10conf *conf) printk(KERN_DEBUG " --- wd:%d rd:%d\n", conf->geo.raid_disks - conf->mddev->degraded, conf->geo.raid_disks); + /* This is only called with ->reconfix_mutex held, so + * rcu protection of rdev is not needed */ for (i = 0; i < conf->geo.raid_disks; i++) { char b[BDEVNAME_SIZE]; - tmp = conf->mirrors + i; - if (tmp->rdev) + rdev = conf->mirrors[i].rdev; + if (rdev) printk(KERN_DEBUG " disk %d, wo:%d, o:%d, dev:%s\n", - i, !test_bit(In_sync, &tmp->rdev->flags), - !test_bit(Faulty, &tmp->rdev->flags), - bdevname(tmp->rdev->bdev,b)); + i, !test_bit(In_sync, &rdev->flags), + !test_bit(Faulty, &rdev->flags), + bdevname(rdev->bdev,b)); } } |