f2fs: fix incorrect mapping in ->bmap
Currently, generic_block_bmap is used in f2fs_bmap, its semantics is when the mapping is been found, return position of target physical block, otherwise return zero. But, previously, when there is no mapping info for specified logical block, f2fs_bmap will map target physical block to a uninitialized variable, which should be wrong. Fix it. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Родитель
fb58ae2206
Коммит
43473f9645
|
@ -648,6 +648,8 @@ next_dnode:
|
||||||
set_new_dnode(&dn, inode, NULL, NULL, 0);
|
set_new_dnode(&dn, inode, NULL, NULL, 0);
|
||||||
err = get_dnode_of_data(&dn, pgofs, mode);
|
err = get_dnode_of_data(&dn, pgofs, mode);
|
||||||
if (err) {
|
if (err) {
|
||||||
|
if (flag == F2FS_GET_BLOCK_BMAP)
|
||||||
|
map->m_pblk = 0;
|
||||||
if (err == -ENOENT) {
|
if (err == -ENOENT) {
|
||||||
err = 0;
|
err = 0;
|
||||||
if (map->m_next_pgofs)
|
if (map->m_next_pgofs)
|
||||||
|
@ -683,17 +685,18 @@ next_block:
|
||||||
map->m_flags = F2FS_MAP_NEW;
|
map->m_flags = F2FS_MAP_NEW;
|
||||||
blkaddr = dn.data_blkaddr;
|
blkaddr = dn.data_blkaddr;
|
||||||
} else {
|
} else {
|
||||||
|
if (flag == F2FS_GET_BLOCK_BMAP) {
|
||||||
|
map->m_pblk = 0;
|
||||||
|
goto sync_out;
|
||||||
|
}
|
||||||
if (flag == F2FS_GET_BLOCK_FIEMAP &&
|
if (flag == F2FS_GET_BLOCK_FIEMAP &&
|
||||||
blkaddr == NULL_ADDR) {
|
blkaddr == NULL_ADDR) {
|
||||||
if (map->m_next_pgofs)
|
if (map->m_next_pgofs)
|
||||||
*map->m_next_pgofs = pgofs + 1;
|
*map->m_next_pgofs = pgofs + 1;
|
||||||
}
|
}
|
||||||
if (flag != F2FS_GET_BLOCK_FIEMAP ||
|
if (flag != F2FS_GET_BLOCK_FIEMAP ||
|
||||||
blkaddr != NEW_ADDR) {
|
blkaddr != NEW_ADDR)
|
||||||
if (flag == F2FS_GET_BLOCK_BMAP)
|
|
||||||
err = -ENOENT;
|
|
||||||
goto sync_out;
|
goto sync_out;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче