Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

[linux.git] / drivers / block / loop.h

diff --git a/drivers/block/loop.h b/drivers/block/loop.h
index fecd3f97ef8c7cd9f825e6c58777a1a2bc6f3461..f68c1d50802fddb3289480124fc1459c9b66ea9e 100644 (file)
--- a/drivers/block/loop.h
+++ b/drivers/block/loop.h
@@ -48,7 +48,6 @@ struct loop_device {
 
        struct file *   lo_backing_file;
        struct block_device *lo_device;
-       unsigned        lo_blocksize;
        void            *key_data; 
 
        gfp_t           old_gfp_mask;
@@ -68,10 +67,13 @@ struct loop_device {
 struct loop_cmd {
        struct kthread_work work;
        struct request *rq;
-       struct list_head list;
-       bool use_aio;           /* use AIO interface to handle I/O */
+       union {
+               bool use_aio; /* use AIO interface to handle I/O */
+               atomic_t ref; /* only for aio */
+       };
        long ret;
        struct kiocb iocb;
+       struct bio_vec *bvec;
 };
 
 /* Support for loadable transfer modules */