提交 5e3969a4 编写于 作者: H haiqing.shq 提交者: Xie XiuQi

mm/filemap.c: Use existing variable

mainline inclusion
from mainline-4.20-rc1
commit 3cb7b121
category: bugfix
bugzilla: 11621
CVE: NA

------------------------------------------------

Use the variable write_len instead of ov_iter_count(from).

Link: http://lkml.kernel.org/r/1537375855-2088-1-git-send-email-leviathan0992@gmail.comSigned-off-by: Nhaiqing.shq <leviathan0992@gmail.com>
Reviewed-by: NAndrew Morton <akpm@linux-foundation.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Nzhong jiang <zhongjiang@huawei.com>
Reviewed-by: NJing Xiangfeng <jingxiangfeng@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 15129a33
...@@ -3034,7 +3034,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from) ...@@ -3034,7 +3034,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)
if (iocb->ki_flags & IOCB_NOWAIT) { if (iocb->ki_flags & IOCB_NOWAIT) {
/* If there are pages to writeback, return */ /* If there are pages to writeback, return */
if (filemap_range_has_page(inode->i_mapping, pos, if (filemap_range_has_page(inode->i_mapping, pos,
pos + iov_iter_count(from))) pos + write_len))
return -EAGAIN; return -EAGAIN;
} else { } else {
written = filemap_write_and_wait_range(mapping, pos, written = filemap_write_and_wait_range(mapping, pos,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册