diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/extents.c | 2 | ||||
-rw-r--r-- | fs/ext4/inode.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index e40332158340..172656c2a3bd 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -2875,6 +2875,8 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, | |||
2875 | if (allocated > max_blocks) | 2875 | if (allocated > max_blocks) |
2876 | allocated = max_blocks; | 2876 | allocated = max_blocks; |
2877 | set_buffer_unwritten(bh_result); | 2877 | set_buffer_unwritten(bh_result); |
2878 | bh_result->b_bdev = inode->i_sb->s_bdev; | ||
2879 | bh_result->b_blocknr = newblock; | ||
2878 | goto out2; | 2880 | goto out2; |
2879 | } | 2881 | } |
2880 | 2882 | ||
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index e91f978c7f12..d4b634ae06bd 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -2323,6 +2323,13 @@ static int ext4_da_get_block_prep(struct inode *inode, sector_t iblock, | |||
2323 | set_buffer_delay(bh_result); | 2323 | set_buffer_delay(bh_result); |
2324 | } else if (ret > 0) { | 2324 | } else if (ret > 0) { |
2325 | bh_result->b_size = (ret << inode->i_blkbits); | 2325 | bh_result->b_size = (ret << inode->i_blkbits); |
2326 | /* | ||
2327 | * With sub-block writes into unwritten extents | ||
2328 | * we also need to mark the buffer as new so that | ||
2329 | * the unwritten parts of the buffer gets correctly zeroed. | ||
2330 | */ | ||
2331 | if (buffer_unwritten(bh_result)) | ||
2332 | set_buffer_new(bh_result); | ||
2326 | ret = 0; | 2333 | ret = 0; |
2327 | } | 2334 | } |
2328 | 2335 | ||