ext4: use memcpy_to_page() in pagecache_write()
[ Upstream commit bd256fda92efe97b692dc72e246d35fa724d42d8 ] Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Link: https://lore.kernel.org/r/20210207190425.38107-7-chaitanya.kulkarni@wdc.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Stable-dep-of: 956510c0c743 ("fs: ext4: initialize fsdata in pagecache_write()") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
60d4383c1b
commit
b33e42d65e
@@ -80,7 +80,6 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,
|
|||||||
PAGE_SIZE - offset_in_page(pos));
|
PAGE_SIZE - offset_in_page(pos));
|
||||||
struct page *page;
|
struct page *page;
|
||||||
void *fsdata;
|
void *fsdata;
|
||||||
void *addr;
|
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
res = pagecache_write_begin(NULL, inode->i_mapping, pos, n, 0,
|
res = pagecache_write_begin(NULL, inode->i_mapping, pos, n, 0,
|
||||||
@@ -88,9 +87,7 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,
|
|||||||
if (res)
|
if (res)
|
||||||
return res;
|
return res;
|
||||||
|
|
||||||
addr = kmap_atomic(page);
|
memcpy_to_page(page, offset_in_page(pos), buf, n);
|
||||||
memcpy(addr + offset_in_page(pos), buf, n);
|
|
||||||
kunmap_atomic(addr);
|
|
||||||
|
|
||||||
res = pagecache_write_end(NULL, inode->i_mapping, pos, n, n,
|
res = pagecache_write_end(NULL, inode->i_mapping, pos, n, n,
|
||||||
page, fsdata);
|
page, fsdata);
|
||||||
|
Reference in New Issue
Block a user