lift generic_write_checks() into callers of __generic_file_write_iter()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 11 insertions, 3 deletions

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 9ad03036d9f5..f7cca423dded 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) {