aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-02-17 13:46:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-17 14:34:52 -0800
commit92b20708f9f0c6429b3b6865de567e721f509c75 (patch)
tree384d16158bc762c47ff9ff0c2c3c2205b28acc28
parentfs/affs/file.c: replace if/BUG by BUG_ON (diff)
downloadlinux-dev-92b20708f9f0c6429b3b6865de567e721f509c75.tar.xz
linux-dev-92b20708f9f0c6429b3b6865de567e721f509c75.zip
fs/affs/file.c: fix direct IO writes beyond EOF
Use the same fallback to normal IO in case of write operations beyond EOF as fat direct IO. This patch fixes fsx file -d -Z -r 4096 -w 4096 Report: 129(129 mod 256): TRUNCATE DOWN from 0x3ff01 to 0xb3f6 130(130 mod 256): WRITE 0x22000 thru 0x2dfff (0xc000 bytes) HOLE Thanks to Jan for helping me on this problem. The ideal solution suggested by Jan Kara would be to use cont_write_begin() but affs direct_IO shouldn't be used a lot anyway... Signed-off-by: Fabian Frederick <fabf@skynet.be> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/affs/file.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/affs/file.c b/fs/affs/file.c
index 7e83ba22bed4..d2468bf95669 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -398,6 +398,13 @@ affs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
size_t count = iov_iter_count(iter);
ssize_t ret;
+ if (rw == WRITE) {
+ loff_t size = offset + count;
+
+ if (AFFS_I(inode)->mmu_private < size)
+ return 0;
+ }
+
ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, affs_get_block);
if (ret < 0 && (rw & WRITE))
affs_write_failed(mapping, offset + count);