Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

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

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 40f63c9879d26798bbfc073753cc58ecd9de306b..26a0a103898f15bd755a7df696e3b9c52ec717cb 100644 (file)
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -17,6 +17,7 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 
 /* Possible states of device */
 enum {
@@ -58,12 +59,13 @@ struct loop_device {
        struct bio              *lo_bio;
        struct bio              *lo_biotail;
        int                     lo_state;
-       struct semaphore        lo_sem;
-       struct semaphore        lo_ctl_mutex;
-       struct semaphore        lo_bh_mutex;
-       int                     lo_pending;
+       struct mutex            lo_ctl_mutex;
+       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__ */