diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 13:54:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 13:54:08 -0700 |
| commit | 435a71d9ef68b03343949c814986e01dae849763 (patch) | |
| tree | 04fb8dee9d5bd751da1cc8cbeb0e5a5f91c72ffc | |
| parent | df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb (diff) | |
| parent | 80ffb3cceaefa405f2ecd46d66500ed8d53efe74 (diff) | |
| download | linux-3.10-435a71d9ef68b03343949c814986e01dae849763.tar.gz linux-3.10-435a71d9ef68b03343949c814986e01dae849763.tar.bz2 linux-3.10-435a71d9ef68b03343949c814986e01dae849763.zip | |
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.
| -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 103f2d33fa8..9dd872000ce 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) if (mode == 1) set_disk_ro(disk, 1); clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); + err = 0; } out: mutex_unlock(&mddev->open_mutex); |