From 1433b350d4fa7b01cf1d16208069b67d4335820a Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 7 Jul 2010 16:51:27 +0200
Subject: [PATCH] --- yaml --- r: 208266 b: refs/heads/master c:
 6de43703108bb1d3fc9495b3e8107d6ec72f97e4 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/block/ioctl.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 545547b6e69e..1fed5b80ca43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62c2a7d969f30163f733c81158254b3095b23e72
+refs/heads/master: 6de43703108bb1d3fc9495b3e8107d6ec72f97e4
diff --git a/trunk/block/ioctl.c b/trunk/block/ioctl.c
index 9d91e830b320..60f477c91eef 100644
--- a/trunk/block/ioctl.c
+++ b/trunk/block/ioctl.c
@@ -197,10 +197,8 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 		if (ret != -EINVAL && ret != -ENOTTY)
 			return ret;
 
-		lock_kernel();
 		fsync_bdev(bdev);
 		invalidate_bdev(bdev);
-		unlock_kernel();
 		return 0;
 
 	case BLKROSET:
@@ -212,9 +210,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 			return -EACCES;
 		if (get_user(n, (int __user *)(arg)))
 			return -EFAULT;
-		lock_kernel();
 		set_device_ro(bdev, n);
-		unlock_kernel();
 		return 0;
 
 	case BLKDISCARD: {