diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 16:54:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 16:54:08 -0400 |
| commit | 435a71d9ef68b03343949c814986e01dae849763 (patch) | |
| tree | 04fb8dee9d5bd751da1cc8cbeb0e5a5f91c72ffc /drivers/md | |
| parent | df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb (diff) | |
| parent | 80ffb3cceaefa405f2ecd46d66500ed8d53efe74 (diff) | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
Fix new incorrect error return from do_md_stop.
Diffstat (limited to 'drivers/md')
| -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); |