Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[firefly-linux-kernel-4.4.55.git] / drivers / block / loop.h

diff --git a/drivers/block/loop.h b/drivers/block/loop.h
index 301c27f8323ffd9d53c563ed6ee7785a38b26eaa..25e8997ed2467f2aa1478636780d0bbb918a6cd8 100644 (file)
--- a/drivers/block/loop.h
+++ b/drivers/block/loop.h
@@ -28,7 +28,7 @@ struct loop_func_table;
 
 struct loop_device {
        int             lo_number;
-       int             lo_refcnt;
+       atomic_t        lo_refcnt;
        loff_t          lo_offset;
        loff_t          lo_sizelimit;
        int             lo_flags;
@@ -54,6 +54,7 @@ struct loop_device {
        gfp_t           old_gfp_mask;
 
        spinlock_t              lo_lock;
+       struct workqueue_struct *wq;
        struct list_head        write_cmd_head;
        struct work_struct      write_work;
        bool                    write_started;