---

yaml --- r: 208266 b: refs/heads/master c: 6de4370 h: refs/heads/master v: v3
git-mirror · Aug 7, 2010 · 1433b35 · 1433b35
1 parent b95d2fe
commit 1433b35
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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: {