summaryrefslogtreecommitdiffstats
path: root/fs/ext4/file.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-07 11:28:12 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-11 22:29:47 -0400
commit5f380c7fa7e01f15ca0816bd241ece9a64a73192 (patch)
tree2136f54098eb85d21d17ee43f73724a5befd70a1 /fs/ext4/file.c
parent0b8def9d6dfa6b2a9a2740cf81d8d2c134688d39 (diff)
downloadop-kernel-dev-5f380c7fa7e01f15ca0816bd241ece9a64a73192.zip
op-kernel-dev-5f380c7fa7e01f15ca0816bd241ece9a64a73192.tar.gz
lift generic_write_checks() into callers of __generic_file_write_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext4/file.c')
-rw-r--r--fs/ext4/file.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 9ad0303..f7cca42 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -132,9 +132,8 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
ret = -EFBIG;
goto errout;
}
-
- if (pos + length > sbi->s_bitmap_maxbytes)
- iov_iter_truncate(from, sbi->s_bitmap_maxbytes - pos);
+ iov_iter_truncate(from, sbi->s_bitmap_maxbytes - pos);
+ length = iov_iter_count(from);
}
iocb->private = &overwrite;
@@ -172,7 +171,16 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
}
}
+ ret = generic_write_checks(file, &iocb->ki_pos, &length, 0);
+ if (ret)
+ goto out;
+
+ if (length == 0)
+ goto out;
+
+ iov_iter_truncate(from, length);
ret = __generic_file_write_iter(iocb, from);
+out:
mutex_unlock(&inode->i_mutex);
if (ret > 0) {
OpenPOWER on IntegriCloud