dm: stop using WQ_NON_REENTRANT

[~andy/linux] / drivers / md / dm.c

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index ecff83f5b53a0c2653fa7b1006de370d483fb5ed..ef095a96d039192c5f8b9c363628ff4de22116a5 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -133,6 +133,13 @@ struct mapped_device {
        atomic_t holders;
        atomic_t open_count;
 
+       /*
+        * The current mapping.
+        * Use dm_get_live_table{_fast} or take suspend_lock for
+        * dereference.
+        */
+       struct dm_table *map;
+
        unsigned long flags;
 
        struct request_queue *queue;
@@ -161,13 +168,6 @@ struct mapped_device {
         */
        struct workqueue_struct *wq;
 
-       /*
-        * The current mapping.
-        * Use dm_get_live_table{_fast} or take suspend_lock for
-        * dereference.
-        */
-       struct dm_table *map;
-
        /*
         * io objects are allocated from here.
         */
@@ -1946,8 +1946,7 @@ static struct mapped_device *alloc_dev(int minor)
        add_disk(md->disk);
        format_dev_t(md->name, MKDEV(_major, minor));
 
-       md->wq = alloc_workqueue("kdmflush",
-                                WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
+       md->wq = alloc_workqueue("kdmflush", WQ_MEM_RECLAIM, 0);
        if (!md->wq)
                goto bad_thread;