Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 8220d9c..e76c761 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 {
@@ -52,16 +53,16 @@ struct loop_device {
        unsigned        lo_blocksize;
        void            *key_data; 
 
-       int             old_gfp_mask;
+       gfp_t           old_gfp_mask;
 
        spinlock_t              lo_lock;
        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;
-       atomic_t                lo_pending;
+       struct completion       lo_done;
+       struct completion       lo_bh_done;
+       struct mutex            lo_ctl_mutex;
+       int                     lo_pending;
 
        request_queue_t         *lo_queue;
 };