1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 76d1fc9c65ba..a2f8a7153dce 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1116,6 +1116,8 @@ static int raid10_spare_active(mddev_t *mddev)
         int i;
         conf_t *conf = mddev->private;
         mirror_info_t *tmp;
+        int count = 0;
+        unsigned long flags;
 
         /*
          * Find all non-in_sync disks within the RAID10 configuration
@@ -1126,16 +1128,16 @@ static int raid10_spare_active(mddev_t *mddev)
                 if (tmp->rdev
                     && !test_bit(Faulty, &tmp->rdev->flags)
                     && !test_and_set_bit(In_sync, &tmp->rdev->flags)) {
-                        unsigned long flags;
-                        spin_lock_irqsave(&conf->device_lock, flags);
-                        mddev->degraded--;
-                        spin_unlock_irqrestore(&conf->device_lock, flags);
+                        count++;
                         sysfs_notify_dirent(tmp->rdev->sysfs_state);
                 }
         }
+        spin_lock_irqsave(&conf->device_lock, flags);
+        mddev->degraded -= count;
+        spin_unlock_irqrestore(&conf->device_lock, flags);
 
         print_conf(conf);
-        return 0;
+        return count;
 }