diff options
author | NeilBrown <neilb@suse.de> | 2011-01-13 17:14:34 -0500 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2011-01-13 17:14:34 -0500 |
commit | 75d3da43cb74d2e5fb87816dbfecb839cd97c7f4 (patch) | |
tree | 27074aceb801ada315329591f32c938b36150ed9 /drivers/md/raid5.c | |
parent | a6ff7e089c7fca813c956ccbed824087e89a3a49 (diff) |
md: Don't let implementation detail of curr_resync leak out through sysfs.
mddev->curr_resync has artificial values of '1' and '2' which are used
by the code which ensures only one resync is happening at a time on
any given device.
These values are internal and should never be exposed to user-space
(except when translated appropriately as in the 'pending' status in
/proc/mdstat).
Unfortunately they are as ->curr_resync is assigned to
->curr_resync_completed and that value is directly visible through
sysfs.
So change the assignments to ->curr_resync_completed to get the same
valued from elsewhere in a form that doesn't have the magic '1' or '2'
values.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 9212c077095c..d223a6c0ccc4 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -4236,7 +4236,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped | |||
4236 | wait_event(conf->wait_for_overlap, | 4236 | wait_event(conf->wait_for_overlap, |
4237 | atomic_read(&conf->reshape_stripes)==0); | 4237 | atomic_read(&conf->reshape_stripes)==0); |
4238 | mddev->reshape_position = conf->reshape_progress; | 4238 | mddev->reshape_position = conf->reshape_progress; |
4239 | mddev->curr_resync_completed = mddev->curr_resync; | 4239 | mddev->curr_resync_completed = sector_nr; |
4240 | conf->reshape_checkpoint = jiffies; | 4240 | conf->reshape_checkpoint = jiffies; |
4241 | set_bit(MD_CHANGE_DEVS, &mddev->flags); | 4241 | set_bit(MD_CHANGE_DEVS, &mddev->flags); |
4242 | md_wakeup_thread(mddev->thread); | 4242 | md_wakeup_thread(mddev->thread); |
@@ -4337,7 +4337,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped | |||
4337 | wait_event(conf->wait_for_overlap, | 4337 | wait_event(conf->wait_for_overlap, |
4338 | atomic_read(&conf->reshape_stripes) == 0); | 4338 | atomic_read(&conf->reshape_stripes) == 0); |
4339 | mddev->reshape_position = conf->reshape_progress; | 4339 | mddev->reshape_position = conf->reshape_progress; |
4340 | mddev->curr_resync_completed = mddev->curr_resync + reshape_sectors; | 4340 | mddev->curr_resync_completed = sector_nr; |
4341 | conf->reshape_checkpoint = jiffies; | 4341 | conf->reshape_checkpoint = jiffies; |
4342 | set_bit(MD_CHANGE_DEVS, &mddev->flags); | 4342 | set_bit(MD_CHANGE_DEVS, &mddev->flags); |
4343 | md_wakeup_thread(mddev->thread); | 4343 | md_wakeup_thread(mddev->thread); |