aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-07 11:35:14 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-11 22:29:48 -0400
commit7ec7b94a3339756dfbb88234e3e45a428e8c08fb (patch)
treee55fca1c1931e3ddaec1f7fbb3addcc2abaf5bf4 /fs
parent5f380c7fa7e01f15ca0816bd241ece9a64a73192 (diff)
blkdev_write_iter: expand generic_file_checks() call in there
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/block_dev.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index bcd7f97beab9..897ee0503932 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1595,18 +1595,21 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)
1595ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from) 1595ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
1596{ 1596{
1597 struct file *file = iocb->ki_filp; 1597 struct file *file = iocb->ki_filp;
1598 struct inode *bd_inode = file->f_mapping->host;
1599 loff_t size = i_size_read(bd_inode);
1598 struct blk_plug plug; 1600 struct blk_plug plug;
1599 ssize_t ret; 1601 ssize_t ret;
1600 size_t count = iov_iter_count(from);
1601 1602
1602 ret = generic_write_checks(file, &iocb->ki_pos, &count, 1); 1603 if (bdev_read_only(I_BDEV(bd_inode)))
1603 if (ret) 1604 return -EPERM;
1604 return ret;
1605 1605
1606 if (count == 0) 1606 if (!iov_iter_count(from))
1607 return 0; 1607 return 0;
1608 1608
1609 iov_iter_truncate(from, count); 1609 if (iocb->ki_pos >= size)
1610 return -ENOSPC;
1611
1612 iov_iter_truncate(from, size - iocb->ki_pos);
1610 1613
1611 blk_start_plug(&plug); 1614 blk_start_plug(&plug);
1612 ret = __generic_file_write_iter(iocb, from); 1615 ret = __generic_file_write_iter(iocb, from);