Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / drivers / block / xen-blkback / common.h

diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index be052773ad03c186666af7602e1c7c1b0c4d6329..f65b807e32361c861266a6d0d4320bfc7be5fd4e 100644 (file)
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -314,7 +314,7 @@ struct xen_blkif {
        unsigned long long                      st_rd_sect;
        unsigned long long                      st_wr_sect;
 
-       wait_queue_head_t       waiting_to_free;
+       struct work_struct      free_work;
        /* Thread shutdown wait queue. */
        wait_queue_head_t       shutdown_wq;
 };
@@ -361,7 +361,7 @@ struct pending_req {
 #define xen_blkif_put(_b)                              \
        do {                                            \
                if (atomic_dec_and_test(&(_b)->refcnt)) \
-                       wake_up(&(_b)->waiting_to_free);\
+                       schedule_work(&(_b)->free_work);\
        } while (0)
 
 struct phys_req {