Commit 6de43703 authored Jul 07, 2010 by Arnd Bergmann Committed by Jens Axboe Aug 07, 2010

block: remove BKL from BLKROSET and BLKFLSBUF



We only call the functions set_device_ro(),
invalidate_bdev(), sync_filesystem() and sync_blockdev()
while holding the BKL in these commands. All
of these are also done in other code paths without
the BKL, which leads me to the conclusion that
the BKL is not needed here either.

The reason we hold it here is that it was originally
pushed down into the ioctl function from vfs_ioctl.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

parent 62c2a7d9

block/ioctl.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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: {

Admin message