X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Floop.h;h=e76c7611d6cc56e115ad71a49aa25861cc2208f6;hb=364c6badde0dd62a0a38e5ed67f85d87d6665780;hp=53fa51595443e81d2878ab22902f0815d1933844;hpb=d2f6409584e2c62ffad81690562330ff3bf4a458;p=powerpc.git

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 53fa515954..e76c7611d6 100644
--- 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;