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

[ Upstream commit 5c27a6d0a691c35ad78d8545a3d6a554dd8e716b ]

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 58b77f0b0a05a71c15b15790f86eaacbe14639f9..a700df05cd182ec812af739d12dec5ef282ff224 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -43,7 +43,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;
@@ -53,11 +52,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);
 }
@@ -224,7 +220,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;
 
@@ -241,10 +236,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 3f2fe60346401911d0bc9b03cd22e065b2b8073b..401bc0e7f6eb0392518d64b36c311e768c474b2f 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1824,7 +1824,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;
@@ -1857,9 +1856,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;
@@ -1881,7 +1878,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;
 
@@ -1900,10 +1896,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 7944a08a3977e44896683cd0742b2fbd300ed37e..e5a47782a97ef0b730daa97de5dc4f0158144d88 100644 (file)
--- a/fs/f2fs/verity.c
+++ b/fs/f2fs/verity.c
@@ -45,16 +45,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);
 
@@ -80,7 +77,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,
@@ -88,9 +84,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);