diff options
author | Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com> | 2018-10-30 15:06:24 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-01 09:13:55 +0100 |
commit | 42934683c91167ce68ddc2323d97acc8c3e5cc69 (patch) | |
tree | 1882d3dd0681a7a5246368216530234e70317975 /fs/hfs | |
parent | 0a729bac19dd40ba7214cd220672c854d35ed2e3 (diff) | |
download | linux-stable-42934683c91167ce68ddc2323d97acc8c3e5cc69.tar.gz linux-stable-42934683c91167ce68ddc2323d97acc8c3e5cc69.tar.bz2 linux-stable-42934683c91167ce68ddc2323d97acc8c3e5cc69.zip |
hfs: fix return value of hfs_get_block()
[ Upstream commit 1267a07be5ebbff2d2739290f3d043ae137c15b4 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.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, ablock = (u32)block / HFS_SB(sb)->fs_div; if (block >= HFS_I(inode)->fs_blocks) { - if (block > HFS_I(inode)->fs_blocks || !create) + if (!create) + return 0; + if (block > HFS_I(inode)->fs_blocks) return -EIO; if (ablock >= HFS_I(inode)->alloc_blocks) { res = hfs_extend_file(inode); |