diff options
| author | NeilBrown <neilb@suse.com> | 2017-10-19 03:49:15 +0200 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2017-11-02 05:32:20 +0100 |
| commit | b03e0ccb5ab9df3efbe51c87843a1ffbecbafa1f (patch) | |
| tree | 4991194aa067e459500bf1c6515b6d716145165c /drivers/md/raid1.c | |
| parent | md: allow metadata update while suspending. (diff) | |
| download | linux-b03e0ccb5ab9df3efbe51c87843a1ffbecbafa1f.tar.xz linux-b03e0ccb5ab9df3efbe51c87843a1ffbecbafa1f.zip | |
md: remove special meaning of ->quiesce(.., 2)
The '2' argument means "wake up anything that is waiting".
This is an inelegant part of the design and was added
to help support management of suspend_lo/suspend_hi setting.
Now that suspend_lo/hi is managed in mddev_suspend/resume,
that need is gone.
These is still a couple of places where we call 'quiesce'
with an argument of '2', but they can safely be changed to
call ->quiesce(.., 1); ->quiesce(.., 0) which
achieve the same result at the small cost of pausing IO
briefly.
This removes a small "optimization" from suspend_{hi,lo}_store,
but it isn't clear that optimization served a useful purpose.
The code now is a lot clearer.
Suggested-by: Shaohua Li <shli@kernel.org>
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index fb56ef79a1c3..9428dfa7e9a0 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -3273,21 +3273,14 @@ static int raid1_reshape(struct mddev *mddev) return 0; } -static void raid1_quiesce(struct mddev *mddev, int state) +static void raid1_quiesce(struct mddev *mddev, int quiesce) { struct r1conf *conf = mddev->private; - switch(state) { - case 2: /* wake for suspend */ - wake_up(&conf->wait_barrier); - break; - case 1: + if (quiesce) freeze_array(conf, 0); - break; - case 0: + else unfreeze_array(conf); - break; - } } static void *raid1_takeover(struct mddev *mddev) |