diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
| commit | af15c1addf920d830b030e3489a482456904ca8c (patch) | |
| tree | dc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /drivers/md/md.c | |
| parent | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (diff) | |
| parent | dcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 103f2d33fa89..9dd872000cec 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -4364,6 +4364,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
| 4364 | if (mode == 1) | 4364 | if (mode == 1) |
| 4365 | set_disk_ro(disk, 1); | 4365 | set_disk_ro(disk, 1); |
| 4366 | clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); | 4366 | clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); |
| 4367 | err = 0; | ||
| 4367 | } | 4368 | } |
| 4368 | out: | 4369 | out: |
| 4369 | mutex_unlock(&mddev->open_mutex); | 4370 | mutex_unlock(&mddev->open_mutex); |