diff options
author | Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com> | 2018-10-30 18:06:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-31 11:54:13 -0400 |
commit | 1267a07be5ebbff2d2739290f3d043ae137c15b4 (patch) | |
tree | bc93479e2a8d8472d9aedc7226d7aebff7872e30 /fs/hfs | |
parent | 839c3a6a5e1fbc8542d581911b35b2cb5cd29304 (diff) |
hfs: fix return value of hfs_get_block()
Direct writes to empty inodes fail with EIO. The generic direct-io code
is in part to blame (a patch has been submitted as "direct-io: allow
direct writes to empty inodes"), but hfs is worse affected than the other
filesystems because the fallback to buffered I/O doesn't happen.
The problem is the return value of hfs_get_block() when called with
!create. Change it to be more consistent with the other modules.
Link: http://lkml.kernel.org/r/4538ab8c35ea37338490525f0f24cbc37227528c.1539195310.git.ernesto.mnd.fernandez@gmail.com
Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfs')
-rw-r--r-- | fs/hfs/extent.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/hfs/extent.c b/fs/hfs/extent.c index 0c638c612152..5f1ff97a3b98 100644 --- a/fs/hfs/extent.c +++ b/fs/hfs/extent.c | |||
@@ -345,7 +345,9 @@ int hfs_get_block(struct inode *inode, sector_t block, | |||
345 | ablock = (u32)block / HFS_SB(sb)->fs_div; | 345 | ablock = (u32)block / HFS_SB(sb)->fs_div; |
346 | 346 | ||
347 | if (block >= HFS_I(inode)->fs_blocks) { | 347 | if (block >= HFS_I(inode)->fs_blocks) { |
348 | if (block > HFS_I(inode)->fs_blocks || !create) | 348 | if (!create) |
349 | return 0; | ||
350 | if (block > HFS_I(inode)->fs_blocks) | ||
349 | return -EIO; | 351 | return -EIO; |
350 | if (ablock >= HFS_I(inode)->alloc_blocks) { | 352 | if (ablock >= HFS_I(inode)->alloc_blocks) { |
351 | res = hfs_extend_file(inode); | 353 | res = hfs_extend_file(inode); |