Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 230682
b: refs/heads/master
c: 4d4d66a
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Alasdair G Kergon committed Jan 13, 2011
1 parent 6c21fac commit 0d814c0
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f521f074abe7b3990f5df65482cdc3d851b80665
refs/heads/master: 4d4d66ab5322fa9b0f51842a76139387a40e1ce9
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm-delay.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ static int __init dm_delay_init(void)
{
int r = -ENOMEM;

kdelayd_wq = create_workqueue("kdelayd");
kdelayd_wq = alloc_workqueue("kdelayd", WQ_MEM_RECLAIM, 0);
if (!kdelayd_wq) {
DMERR("Couldn't start kdelayd");
goto bad_queue;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm-kcopyd.c
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ int dm_kcopyd_client_create(unsigned int nr_pages,
goto bad_slab;

INIT_WORK(&kc->kcopyd_work, do_work);
kc->kcopyd_wq = create_singlethread_workqueue("kcopyd");
kc->kcopyd_wq = alloc_ordered_workqueue("kcopyd", WQ_MEM_RECLAIM);
if (!kc->kcopyd_wq)
goto bad_workqueue;

Expand Down
5 changes: 3 additions & 2 deletions trunk/drivers/md/dm-mpath.c
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ static int __init dm_multipath_init(void)
return -EINVAL;
}

kmultipathd = create_workqueue("kmpathd");
kmultipathd = alloc_workqueue("kmpathd", WQ_MEM_RECLAIM, 0);
if (!kmultipathd) {
DMERR("failed to create workqueue kmpathd");
dm_unregister_target(&multipath_target);
Expand All @@ -1689,7 +1689,8 @@ static int __init dm_multipath_init(void)
* old workqueue would also create a bottleneck in the
* path of the storage hardware device activation.
*/
kmpath_handlerd = create_singlethread_workqueue("kmpath_handlerd");
kmpath_handlerd = alloc_ordered_workqueue("kmpath_handlerd",
WQ_MEM_RECLAIM);
if (!kmpath_handlerd) {
DMERR("failed to create workqueue kmpath_handlerd");
destroy_workqueue(kmultipathd);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm-raid1.c
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
ti->num_flush_requests = 1;
ti->num_discard_requests = 1;

ms->kmirrord_wq = create_singlethread_workqueue("kmirrord");
ms->kmirrord_wq = alloc_ordered_workqueue("kmirrord", WQ_MEM_RECLAIM);
if (!ms->kmirrord_wq) {
DMERR("couldn't start kmirrord");
r = -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm-snap-persistent.c
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ static int persistent_ctr(struct dm_exception_store *store,
atomic_set(&ps->pending_count, 0);
ps->callbacks = NULL;

ps->metadata_wq = create_singlethread_workqueue("ksnaphd");
ps->metadata_wq = alloc_ordered_workqueue("ksnaphd", WQ_MEM_RECLAIM);
if (!ps->metadata_wq) {
kfree(ps);
DMERR("couldn't start header metadata update thread");
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1883,7 +1883,7 @@ static struct mapped_device *alloc_dev(int minor)
add_disk(md->disk);
format_dev_t(md->name, MKDEV(_major, minor));

md->wq = create_singlethread_workqueue("kdmflush");
md->wq = alloc_ordered_workqueue("kdmflush", WQ_MEM_RECLAIM);
if (!md->wq)
goto bad_thread;

Expand Down

0 comments on commit 0d814c0

Please sign in to comment.