f2fs: reuse read_inline_data for f2fs_convert_inline_page

f2fs_convert_inline_page introduce what read_inline_data
already does for copying out the inline data from inode_page.
We can use read_inline_data instead to simplify the code.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 0be4a9b400c63db0fecd285b3ad21fe665cb5f7f..6caad8bea8aa8b6894c2f9d68a3a07436db2a58e 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -105,7 +105,6 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page)
 
 int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
 {
-       void *src_addr, *dst_addr;
        struct f2fs_io_info fio = {
                .sbi = F2FS_I_SB(dn->inode),
                .type = DATA,
@@ -115,8 +114,6 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
        };
        int dirty, err;
 
-       f2fs_bug_on(F2FS_I_SB(dn->inode), page->index);
-
        if (!f2fs_exist_data(dn->inode))
                goto clear_out;
 
@@ -125,19 +122,8 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
                return err;
 
        f2fs_bug_on(F2FS_P_SB(page), PageWriteback(page));
-       if (PageUptodate(page))
-               goto no_update;
 
-       zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
-
-       /* Copy the whole inline data block */
-       src_addr = inline_data_addr(dn->inode_page);
-       dst_addr = kmap_atomic(page);
-       memcpy(dst_addr, src_addr, MAX_INLINE_DATA);
-       flush_dcache_page(page);
-       kunmap_atomic(dst_addr);
-       SetPageUptodate(page);
-no_update:
+       read_inline_data(page, dn->inode_page);
        set_page_dirty(page);
 
        /* clear dirty state */