diff options
| author | Chao Yu <yuchao0@huawei.com> | 2016-08-20 15:12:01 +0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:34:00 +0200 |
| commit | 72b3318b53693ba6df4615e09249fc2a9522a6f4 (patch) | |
| tree | ca8b12c95243970fc1c312c6d00caa30b836e681 | |
| parent | 24d9a6d297da4f5eaf26a84d5c239a23a03a61f0 (diff) | |
f2fs: fix to preallocate block only aligned to 4K
In write_begin(), we skip checking dnode block for preallocating block
when whole block needs to be updated since we preallocated its block in
f2fs_preallocate_blocks, for partial updated block, we will still try
to lock its node and do preallocation in write_begin(), so in
f2fs_preallocate_blocks we should not preallocate its block.
But previously, the calculation of preallocating block number is
incorrect, fix it.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
[Jaegeuk Kim: fix a bug]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Conflicts:
fs/f2fs/data.c
| -rw-r--r-- | fs/f2fs/data.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 6916c1b99..eb13f0e55 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -620,7 +620,12 @@ ssize_t f2fs_preallocate_blocks(struct inode *inode, loff_t pos, size_t count, b ssize_t ret = 0; map.m_lblk = F2FS_BLK_ALIGN(pos); - map.m_len = F2FS_BYTES_TO_BLK(count); + map.m_len = F2FS_BYTES_TO_BLK(pos + count); + if (map.m_len > map.m_lblk) + map.m_len -= map.m_lblk; + else + map.m_len = 0; + map.m_next_pgofs = NULL; if (f2fs_encrypted_inode(inode)) @@ -666,6 +671,9 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, bool allocated = false; block_t blkaddr; + if (!maxblocks) + return 0; + map->m_len = 0; map->m_flags = 0; |