diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:05:37 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:05:37 -0400 |
| commit | 2849a3a945d0e440fa245c47c49c80ef1cc103c3 (patch) | |
| tree | 616868130f4b8a063cfa1c138135c10247a4da0e /drivers/md/md.c | |
| parent | 417c765af914106f5e76c4e0181dd555fe6a89a0 (diff) | |
| parent | 8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff) | |
Merge 3.9-rc4 into usb-next
This picks up the fixes we had for USB in 3.9-rc4
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index fcb878f88796..aeceedfc530b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -7663,10 +7663,8 @@ static int remove_and_add_spares(struct mddev *mddev) | |||
| 7663 | removed++; | 7663 | removed++; |
| 7664 | } | 7664 | } |
| 7665 | } | 7665 | } |
| 7666 | if (removed) | 7666 | if (removed && mddev->kobj.sd) |
| 7667 | sysfs_notify(&mddev->kobj, NULL, | 7667 | sysfs_notify(&mddev->kobj, NULL, "degraded"); |
| 7668 | "degraded"); | ||
| 7669 | |||
| 7670 | 7668 | ||
| 7671 | rdev_for_each(rdev, mddev) { | 7669 | rdev_for_each(rdev, mddev) { |
| 7672 | if (rdev->raid_disk >= 0 && | 7670 | if (rdev->raid_disk >= 0 && |