diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:35:52 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:35:52 -0700 |
| commit | 93ee6d1f0f8bdc7347ca23da99a3395f5a013fdc (patch) | |
| tree | e78c01a54d9b3f8e696a0af552ce4f2edf1b7388 /drivers/md | |
| parent | eb57744377e833c82168b0e8487593d038a67551 (diff) | |
| parent | 9b8b905951bde404f20a7bd4b37a5134f3484569 (diff) | |
Merge tag 'v3.14.50' into linux-linaro-lsk-v3.14
This is the 3.14.50 stable release
* tag 'v3.14.50': (30 commits)
Linux 3.14.50
efi: fix 32bit kernel boot failed problem using efi
iscsi-target: Fix iser explicit logout TX kthread leak
iscsi-target: Fix use-after-free during TPG session shutdown
avr32: handle NULL as a valid clock object
vhost: actually track log eventfd file
rds: rds_ib_device.refcount overflow
x86/efi: Use all 64 bit of efi_memmap in setup_e820()
xhci: do not report PLC when link is in internal resume state
xhci: prevent bus_suspend if SS port resuming in phase 1
xhci: report U3 when link is in resume state
xhci: Calculate old endpoints correctly on device reset
usb-storage: ignore ZTE MF 823 card reader in mode 0x1225
ata: pmp: add quirk for Marvell 4140 SATA PMP
blkcg: fix gendisk reference leak in blkg_conf_prep()
Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen
tile: use free_bootmem_late() for initrd
md/raid1: fix test for 'was read error from last working device'.
mmc: sdhci-pxav3: fix platform_data is not initialized
mmc: sdhci-esdhc: Make 8BIT bus work
...
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index b96ee9d78aa3..9be97e0bd149 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -336,7 +336,7 @@ static void raid1_end_read_request(struct bio *bio, int error) spin_lock_irqsave(&conf->device_lock, flags); if (r1_bio->mddev->degraded == conf->raid_disks || (r1_bio->mddev->degraded == conf->raid_disks-1 && - !test_bit(Faulty, &conf->mirrors[mirror].rdev->flags))) + test_bit(In_sync, &conf->mirrors[mirror].rdev->flags))) uptodate = 1; spin_unlock_irqrestore(&conf->device_lock, flags); } |