---

yaml --- r: 40393 b: refs/heads/master c: 750a8f3 h: refs/heads/master i: 40391: 13ce08c v: v3
git-mirror · Oct 28, 2006 · 0ad04a1 · 0ad04a1
1 parent a162cbc
commit 0ad04a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01ab5662f573fe3a6bcefa200f15ab3069cec8a3
+refs/heads/master: 750a8f3e8f64654a584e54038c2c8db380813c79
diff --git a/trunk/drivers/md/multipath.c b/trunk/drivers/md/multipath.c
@@ -277,6 +277,7 @@ static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev)
 			set_bit(Faulty, &rdev->flags);
 			set_bit(MD_CHANGE_DEVS, &mddev->flags);
 			conf->working_disks--;
+			mddev->degraded++;
 			printk(KERN_ALERT "multipath: IO failure on %s,"
 				" disabling IO path. \n	Operation continuing"
 				" on %d IO paths.\n",
@@ -336,6 +337,7 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
 				blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
 
 			conf->working_disks++;
+			mddev->degraded--;
 			rdev->raid_disk = path;
 			set_bit(In_sync, &rdev->flags);
 			rcu_assign_pointer(p->rdev, rdev);