f2fs: use memcpy_{to,from}_page() where possible

[ Upstream commit b87846bd61c7c09560617da416208a5454530d57 ]

This is simpler, and as a side effect it replaces several uses of
kmap_atomic() with its recommended replacement kmap_local_page().

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: b1b9896718bc ("fs: f2fs: initialize fsdata in pagecache_write()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 480d5f76491db5b68be0f534d6038014a4e9827a..bce1c2ae6d15340db0345572899ab56e79d3bd1e 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -64,7 +64,6 @@ bool f2fs_may_inline_dentry(struct inode *inode)
 void f2fs_do_read_inline_data(struct page *page, struct page *ipage)
 {
        struct inode *inode = page->mapping->host;
-       void *src_addr, *dst_addr;
 
        if (PageUptodate(page))
                return;
@@ -74,11 +73,8 @@ void f2fs_do_read_inline_data(struct page *page, struct page *ipage)
        zero_user_segment(page, MAX_INLINE_DATA(inode), PAGE_SIZE);
 
        /* Copy the whole inline data block */
-       src_addr = inline_data_addr(inode, ipage);
-       dst_addr = kmap_atomic(page);
-       memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode));
-       flush_dcache_page(page);
-       kunmap_atomic(dst_addr);
+       memcpy_to_page(page, 0, inline_data_addr(inode, ipage),
+                      MAX_INLINE_DATA(inode));
        if (!PageUptodate(page))
                SetPageUptodate(page);
 }
@@ -246,7 +242,6 @@ out:
 
 int f2fs_write_inline_data(struct inode *inode, struct page *page)
 {
-       void *src_addr, *dst_addr;
        struct dnode_of_data dn;
        int err;
 
@@ -263,10 +258,8 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)
        f2fs_bug_on(F2FS_I_SB(inode), page->index);
 
        f2fs_wait_on_page_writeback(dn.inode_page, NODE, true, true);
-       src_addr = kmap_atomic(page);
-       dst_addr = inline_data_addr(inode, dn.inode_page);
-       memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode));
-       kunmap_atomic(src_addr);
+       memcpy_from_page(inline_data_addr(inode, dn.inode_page),
+                        page, 0, MAX_INLINE_DATA(inode));
        set_page_dirty(dn.inode_page);
 
        f2fs_clear_page_cache_dirty_tag(page);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f4e8de1f47899b18e19a13747fcfed52f7345bec..ae72211e422e71dcfe17cc9ed8037241aa3d1358 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2442,7 +2442,6 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data,
        size_t toread;
        loff_t i_size = i_size_read(inode);
        struct page *page;
-       char *kaddr;
 
        if (off > i_size)
                return 0;
@@ -2476,9 +2475,7 @@ repeat:
                        return -EIO;
                }
 
-               kaddr = kmap_atomic(page);
-               memcpy(data, kaddr + offset, tocopy);
-               kunmap_atomic(kaddr);
+               memcpy_from_page(data, page, offset, tocopy);
                f2fs_put_page(page, 1);
 
                offset = 0;
@@ -2500,7 +2497,6 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,
        size_t towrite = len;
        struct page *page;
        void *fsdata = NULL;
-       char *kaddr;
        int err = 0;
        int tocopy;
 
@@ -2520,10 +2516,7 @@ retry:
                        break;
                }
 
-               kaddr = kmap_atomic(page);
-               memcpy(kaddr + offset, data, tocopy);
-               kunmap_atomic(kaddr);
-               flush_dcache_page(page);
+               memcpy_to_page(page, offset, data, tocopy);
 
                a_ops->write_end(NULL, mapping, off, tocopy, tocopy,
                                                page, fsdata);

diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c
index a28968bb56e625ca638e524c815dc7f4aec1a45e..26e7154168291eeabbb874fc1a35aba607eaee96 100644 (file)
--- a/fs/f2fs/verity.c
+++ b/fs/f2fs/verity.c
@@ -47,16 +47,13 @@ static int pagecache_read(struct inode *inode, void *buf, size_t count,
                size_t n = min_t(size_t, count,
                                 PAGE_SIZE - offset_in_page(pos));
                struct page *page;
-               void *addr;
 
                page = read_mapping_page(inode->i_mapping, pos >> PAGE_SHIFT,
                                         NULL);
                if (IS_ERR(page))
                        return PTR_ERR(page);
 
-               addr = kmap_atomic(page);
-               memcpy(buf, addr + offset_in_page(pos), n);
-               kunmap_atomic(addr);
+               memcpy_from_page(buf, page, offset_in_page(pos), n);
 
                put_page(page);
 
@@ -82,7 +79,6 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,
                                 PAGE_SIZE - offset_in_page(pos));
                struct page *page;
                void *fsdata;
-               void *addr;
                int res;
 
                res = pagecache_write_begin(NULL, inode->i_mapping, pos, n, 0,
@@ -90,9 +86,7 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,
                if (res)
                        return res;
 
-               addr = kmap_atomic(page);
-               memcpy(addr + offset_in_page(pos), buf, n);
-               kunmap_atomic(addr);
+               memcpy_to_page(page, offset_in_page(pos), buf, n);
 
                res = pagecache_write_end(NULL, inode->i_mapping, pos, n, n,
                                          page, fsdata);