Merge branch 'master' into upstream

1 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/loop.h b/include/linux/loop.h
index e76c7611d6cc..191a595055f0 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -59,10 +59,9 @@ struct loop_device {
         struct bio              *lo_bio;
         struct bio              *lo_biotail;
         int                     lo_state;
-        struct completion       lo_done;
-        struct completion       lo_bh_done;
         struct mutex            lo_ctl_mutex;
-        int                     lo_pending;
+        struct task_struct      *lo_thread;
+        wait_queue_head_t       lo_event;
 
         request_queue_t         *lo_queue;
 };