---

yaml --- r: 208267 b: refs/heads/master c: 15392ef h: refs/heads/master i: 208265: b95d2fe 208263: ae77c21 v: v3
git-mirror · Aug 7, 2010 · b49e44d · b49e44d
1 parent 1433b35
commit b49e44d
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: 6de43703108bb1d3fc9495b3e8107d6ec72f97e4
+refs/heads/master: 15392efb9d427482754f6d267262452878667499
diff --git a/trunk/block/ioctl.c b/trunk/block/ioctl.c
@@ -296,14 +296,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 			bd_release(bdev);
 		return ret;
 	case BLKPG:
-		lock_kernel();
 		ret = blkpg_ioctl(bdev, (struct blkpg_ioctl_arg __user *) arg);
-		unlock_kernel();
 		break;
 	case BLKRRPART:
-		lock_kernel();
 		ret = blkdev_reread_part(bdev);
-		unlock_kernel();
 		break;
 	case BLKGETSIZE:
 		size = bdev->bd_inode->i_size;