Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 40f63c9879d2..f96506782ebe 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -58,9 +58,9 @@ struct loop_device {
         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;