diff options
| author | Shaohua Li <shli@fb.com> | 2016-02-24 17:38:28 -0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-18 08:50:41 -0400 |
| commit | 503f8305ab1b82d8788a2f161e7c52c0c0f6aeac (patch) | |
| tree | 579af13d6f803407abe40862735ac942dfb829b3 /drivers/md/raid5.h | |
| parent | 5255a738ee6ecc0e479728efe5668efd64901197 (diff) | |
RAID5: check_reshape() shouldn't call mddev_suspend
[ Upstream commit 27a353c026a879a1001e5eac4bda75b16262c44a ]
check_reshape() is called from raid5d thread. raid5d thread shouldn't
call mddev_suspend(), because mddev_suspend() waits for all IO finish
but IO is handled in raid5d thread, we could easily deadlock here.
This issue is introduced by
738a273 ("md/raid5: fix allocation of 'scribble' array.")
Cc: stable@vger.kernel.org (v4.1+)
Reported-and-tested-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/md/raid5.h')
| -rw-r--r-- | drivers/md/raid5.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 03472fbbd882..d31ed93bb8a9 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -501,6 +501,8 @@ struct r5conf { * conversions */ } __percpu *percpu; + int scribble_disks; + int scribble_sectors; #ifdef CONFIG_HOTPLUG_CPU struct notifier_block cpu_notify; #endif |