Merge git://oss.sgi.com:8090/xfs-2.6

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

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 53fa51595443e81d2878ab22902f0815d1933844..e76c7611d6cc56e115ad71a49aa25861cc2208f6 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,15 +53,15 @@ 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;
+       struct completion       lo_done;
+       struct completion       lo_bh_done;
+       struct mutex            lo_ctl_mutex;
        int                     lo_pending;
 
        request_queue_t         *lo_queue;