Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292787
b: refs/heads/master
c: 9d4c7d8
h: refs/heads/master
i:
  292785: 5811cb0
  292783: 9b0a029
v: v3
  • Loading branch information
NeilBrown committed Mar 13, 2012
1 parent 4e3ecce commit c237f29
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 547414d19fd72376ff2ecc42aac8d7a051f03d26
refs/heads/master: 9d4c7d8799c418816342e263479fa010b182183e
7 changes: 2 additions & 5 deletions trunk/drivers/md/raid5.c
Original file line number Diff line number Diff line change
Expand Up @@ -5547,16 +5547,14 @@ static int raid5_start_reshape(struct mddev *mddev)
* such devices during the reshape and confusion could result.
*/
if (mddev->delta_disks >= 0) {
int added_devices = 0;
list_for_each_entry(rdev, &mddev->disks, same_set)
if (rdev->raid_disk < 0 &&
!test_bit(Faulty, &rdev->flags)) {
if (raid5_add_disk(mddev, rdev) == 0) {
if (rdev->raid_disk
>= conf->previous_raid_disks) {
>= conf->previous_raid_disks)
set_bit(In_sync, &rdev->flags);
added_devices++;
} else
else
rdev->recovery_offset = 0;

if (sysfs_link_rdev(mddev, rdev))
Expand All @@ -5566,7 +5564,6 @@ static int raid5_start_reshape(struct mddev *mddev)
&& !test_bit(Faulty, &rdev->flags)) {
/* This is a spare that was manually added */
set_bit(In_sync, &rdev->flags);
added_devices++;
}

/* When a reshape changes the number of devices,
Expand Down

0 comments on commit c237f29

Please sign in to comment.