From 5e3969a42316c3b22128d1dc643f186b86115eb5 Mon Sep 17 00:00:00 2001 From: "haiqing.shq" Date: Fri, 15 Mar 2019 00:09:21 +0800 Subject: [PATCH] mm/filemap.c: Use existing variable mainline inclusion from mainline-4.20-rc1 commit 3cb7b121ff4d 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.com Signed-off-by: haiqing.shq Reviewed-by: Andrew Morton Cc: Jan Kara Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: zhong jiang Reviewed-by: Jing Xiangfeng Signed-off-by: Yang Yingliang --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index 4585b4e0b912..c2225c12f287 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3034,7 +3034,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from) if (iocb->ki_flags & IOCB_NOWAIT) { /* If there are pages to writeback, return */ if (filemap_range_has_page(inode->i_mapping, pos, - pos + iov_iter_count(from))) + pos + write_len)) return -EAGAIN; } else { written = filemap_write_and_wait_range(mapping, pos, -- GitLab