diff options
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/extents.c | 3 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 9de1c9d1a13d..ee5acf2bd5e6 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -5802,7 +5802,8 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu) * mapped - no physical clusters have been allocated, and the * file has no extents */ - if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) + if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA) || + ext4_has_inline_data(inode)) return 0; /* search for the extent closest to the first block in the cluster */ diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 96517785a9f8..0b87665aaff1 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3149,6 +3149,9 @@ static int ext4_da_write_end(struct file *file, ext4_has_inline_data(inode)) return ext4_write_inline_data_end(inode, pos, len, copied, page); + if (unlikely(copied < len) && !PageUptodate(page)) + copied = 0; + start = pos & (PAGE_SIZE - 1); end = start + copied - 1; |