Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[linux-2.6-omap-h63xx.git] / include / linux / loop.h

diff --git a/include/linux/loop.h b/include/linux/loop.h
index bf3d2345ce99ccafe7f85ace5a23cd836b9d5285..26a0a103898f15bd755a7df696e3b9c52ec717cb 100644 (file)
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -59,12 +59,13 @@ 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;
+       struct request_queue    *lo_queue;
+       struct gendisk          *lo_disk;
+       struct list_head        lo_list;
 };
 
 #endif /* __KERNEL__ */