diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-06-23 17:39:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-06-23 17:39:52 +0800 |
| commit | f651f58577a9d44e0d51bc24b895a4ddd056c97b (patch) | |
| tree | 9ddccf077adc2fd29a7fa3b3ee5d22400d2a0fc7 /drivers/md/dm-raid1.c | |
| parent | 3f7078d01027a8678191be4befcd47303c5c2c83 (diff) | |
| parent | 3ae0c24e1ef998974256a8bd37a6b17d2a8ddc93 (diff) | |
Merge branch 'v3.10/topic/dm-crypt' into linux-linaro-lsk-v3.10linux-linaro-lsk-v3.10-test
Diffstat (limited to 'drivers/md/dm-raid1.c')
| -rw-r--r-- | drivers/md/dm-raid1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index 678556b8ee4d..9388c3654f0a 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c @@ -1089,8 +1089,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv) ti->per_bio_data_size = sizeof(struct dm_raid1_bio_record); ti->discard_zeroes_data_unsupported = true; - ms->kmirrord_wq = alloc_workqueue("kmirrord", - WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0); + ms->kmirrord_wq = alloc_workqueue("kmirrord", WQ_MEM_RECLAIM, 0); if (!ms->kmirrord_wq) { DMERR("couldn't start kmirrord"); r = -ENOMEM; |