Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 237fe3fd235c..7140909f6662 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -313,6 +313,7 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
                         set_bit(In_sync, &rdev->flags);
                         rcu_assign_pointer(p->rdev, rdev);
                         err = 0;
+                        md_integrity_add_rdev(rdev, mddev);
                         break;
                 }
 
@@ -345,7 +346,9 @@ static int multipath_remove_disk(mddev_t *mddev, int number)
                         /* lost the race, try later */
                         err = -EBUSY;
                         p->rdev = rdev;
+                        goto abort;
                 }
+                md_integrity_register(mddev);
         }
 abort:
 
@@ -519,7 +522,7 @@ static int multipath_run (mddev_t *mddev)
         mddev->queue->unplug_fn = multipath_unplug;
         mddev->queue->backing_dev_info.congested_fn = multipath_congested;
         mddev->queue->backing_dev_info.congested_data = mddev;
-
+        md_integrity_register(mddev);
         return 0;
 
 out_free_conf: