From: Andrew Morton <akpm@osdl.org>

Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 block/blktrace.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN block/blktrace.c~sem2mutex-blockdev-2-git-blktrace-fix block/blktrace.c
--- devel/block/blktrace.c~sem2mutex-blockdev-2-git-blktrace-fix	2006-02-27 23:41:56.000000000 -0800
+++ devel-akpm/block/blktrace.c	2006-02-27 23:41:56.000000000 -0800
@@ -413,7 +413,7 @@ int blk_trace_ioctl(struct block_device 
 	if (!q)
 		return -ENXIO;
 
-	down(&bdev->bd_sem);
+	mutex_lock(&bdev->bd_mutex);
 
 	switch (cmd) {
 	case BLKTRACESETUP:
@@ -432,7 +432,7 @@ int blk_trace_ioctl(struct block_device 
 		break;
 	}
 
-	up(&bdev->bd_sem);
+	mutex_unlock(&bdev->bd_mutex);
 	return ret;
 }
 
_