Merge branch 'field-zeroing' into for-linus

[pandora-kernel.git] / include / linux / loop.h

diff --git a/include/linux/loop.h b/include/linux/loop.h
index bf3d234..191a595 100644 (file)
--- 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 task_struct      *lo_thread;
-       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;
 };