X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Floop.h;h=f96506782ebe99265b99b78e3f7cfd50bec8e586;hb=8d238e012469a9a332c78d6a69a8a46ac4b1e9c2;hp=53fa51595443e81d2878ab22902f0815d1933844;hpb=adb7ee3746b579a7fa7af7c4ec2c8164bc910ed4;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 53fa5159544..f96506782eb 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -52,15 +52,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 completion	lo_done;
+	struct completion	lo_bh_done;
 	struct semaphore	lo_ctl_mutex;
-	struct semaphore	lo_bh_mutex;
 	int			lo_pending;
 
 	request_queue_t		*lo_queue;