diff options
| author | Mauro Carvalho Chehab | 2012-10-25 11:15:34 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2012-10-25 11:15:34 +0200 |
| commit | 285019fd95540c92e3348d43c699110458cd133c (patch) | |
| tree | d949b55f5992a0d3dff88fe8e1de11523dce2acb /drivers/md/raid5.c | |
| parent | sb_edac: Avoid overflow errors at memory size calculation (diff) | |
| parent | Linux 3.6 (diff) | |
| download | kernel-qcow2-linux-285019fd95540c92e3348d43c699110458cd133c.tar.gz kernel-qcow2-linux-285019fd95540c92e3348d43c699110458cd133c.tar.xz kernel-qcow2-linux-285019fd95540c92e3348d43c699110458cd133c.zip | |
Merge tag 'v3.6' into fixes
Linux 3.6
* tag 'v3.6': (91 commits)
Linux 3.6
vfs: dcache: fix deadlock in tree traversal
mtdchar: fix offset overflow detection
thp: avoid VM_BUG_ON page_count(page) false positives in __collapse_huge_page_copy
iommu/amd: Fix wrong assumption in iommu-group specific code
netdev: octeon: fix return value check in octeon_mgmt_init_phy()
ALSA: snd-usb: fix next_packet_size calls for pause case
inetpeer: fix token initialization
qlcnic: Fix scheduling while atomic bug
bnx2: Clean up remaining iounmap
trivial select_parent documentation fix
net: phy: smsc: Implement PHY config_init for LAN87xx
smsc75xx: fix resume after device reset
um: Preinclude include/linux/kern_levels.h
um: Fix IPC on um
netdev: pasemi: fix return value check in pasemi_mac_phy_init()
team: fix return value check
l2tp: fix return value check
USB: Fix race condition when removing host controllers
USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
...
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 7031b865b3a0..0689173fd9f5 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1591,6 +1591,7 @@ static int resize_stripes(struct r5conf *conf, int newsize) #ifdef CONFIG_MULTICORE_RAID456 init_waitqueue_head(&nsh->ops.wait_for_ops); #endif + spin_lock_init(&nsh->stripe_lock); list_add(&nsh->lru, &newstripes); } |