aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2008-09-19 02:08:13 -0500
committerAl Viro2008-10-21 06:49:12 -0500
commit6af3a56e1dd4d95836a47214e5c60d5b749a5501 (patch)
tree757b01fe8668783fcf52a4e8fe82c5d8ebbc6b72 /block/ioctl.c
parent45048d0961cdbf7ddfba906797ad8cb42489e070 (diff)
downloadkernel-common-6af3a56e1dd4d95836a47214e5c60d5b749a5501.tar.gz
kernel-common-6af3a56e1dd4d95836a47214e5c60d5b749a5501.tar.xz
kernel-common-6af3a56e1dd4d95836a47214e5c60d5b749a5501.zip
[PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET
We need to do bd_claim() only if file hadn't been opened with O_EXCL and then we have no need to use file itself as owner. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block/ioctl.c')
-rw-r--r--block/ioctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/block/ioctl.c b/block/ioctl.c
index bd214cb37f2..14b7f2c1066 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -343,10 +343,11 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
343 return -EINVAL; 343 return -EINVAL;
344 if (get_user(n, (int __user *) arg)) 344 if (get_user(n, (int __user *) arg))
345 return -EFAULT; 345 return -EFAULT;
346 if (bd_claim(bdev, file) < 0) 346 if (!(mode & FMODE_EXCL) && bd_claim(bdev, &bdev) < 0)
347 return -EBUSY; 347 return -EBUSY;
348 ret = set_blocksize(bdev, n); 348 ret = set_blocksize(bdev, n);
349 bd_release(bdev); 349 if (!(mode & FMODE_EXCL))
350 bd_release(bdev);
350 return ret; 351 return ret;
351 case BLKPG: 352 case BLKPG:
352 lock_kernel(); 353 lock_kernel();