aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Wang <liwang@ubuntukylin.com>2013-11-13 15:22:14 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-08 09:42:11 -0800
commite0050ac1e4b0a9340e9fc3d9d918799613b72f9a (patch)
tree8a1da65f589a36544521d865cc6d03ea90352ce6
parentbe541ecb66d285c4135c3820113af22ff57d4a0c (diff)
downloadlinux-linaro-stable-e0050ac1e4b0a9340e9fc3d9d918799613b72f9a.tar.gz
ceph: Avoid data inconsistency due to d-cache aliasing in readpage()
commit 56f91aad69444d650237295f68c195b74d888d95 upstream. If the length of data to be read in readpage() is exactly PAGE_CACHE_SIZE, the original code does not flush d-cache for data consistency after finishing reading. This patches fixes this. Signed-off-by: Li Wang <liwang@ubuntukylin.com> Signed-off-by: Sage Weil <sage@inktank.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/ceph/addr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index bb01881cb1f2..9fdc0513fb4c 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -213,9 +213,13 @@ static int readpage_nounlock(struct file *filp, struct page *page)
if (err < 0) {
SetPageError(page);
goto out;
- } else if (err < PAGE_CACHE_SIZE) {
+ } else {
+ if (err < PAGE_CACHE_SIZE) {
/* zero fill remainder of page */
- zero_user_segment(page, err, PAGE_CACHE_SIZE);
+ zero_user_segment(page, err, PAGE_CACHE_SIZE);
+ } else {
+ flush_dcache_page(page);
+ }
}
SetPageUptodate(page);