diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
| commit | baf41996d83a6ecd270be42ca1870592827fb30d (patch) | |
| tree | fd59f83bdadfc43ed9b18b4ef5dc5f01f715d1fd /fs/ext4/inode.c | |
| parent | 8a95b5736641a5cd3996e4fe4c0af6ea05cfa86c (diff) | |
| parent | b5bac1f597ae5669dee0d2ae927b8ded0b8f6b34 (diff) | |
Merge tag 'v3.10.79' into linux-linaro-lsk-v3.10
This is the 3.10.79 stable release
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index e48bd5a1814b..9e3d8dd6c40a 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -626,6 +626,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, status = map->m_flags & EXT4_MAP_UNWRITTEN ? EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) && + !(status & EXTENT_STATUS_WRITTEN) && ext4_find_delalloc_range(inode, map->m_lblk, map->m_lblk + map->m_len - 1)) status |= EXTENT_STATUS_DELAYED; @@ -736,6 +737,7 @@ found: status = map->m_flags & EXT4_MAP_UNWRITTEN ? EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) && + !(status & EXTENT_STATUS_WRITTEN) && ext4_find_delalloc_range(inode, map->m_lblk, map->m_lblk + map->m_len - 1)) status |= EXTENT_STATUS_DELAYED; |