diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 3b0cf32c1d66..b7fd9f010b2b 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -986,9 +986,9 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,
 						blkaddr == NULL_ADDR) {
 				if (map->m_next_pgofs)
 					*map->m_next_pgofs = pgofs + 1;
+				goto sync_out;
 			}
-			if (flag != F2FS_GET_BLOCK_FIEMAP ||
-						blkaddr != NEW_ADDR)
+			if (flag != F2FS_GET_BLOCK_FIEMAP)
 				goto sync_out;
 		}
 	}