diff options
| author | Li Wang <liwang@ubuntukylin.com> | 2013-11-13 15:22:14 +0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-12-13 09:11:38 -0800 |
| commit | 56f91aad69444d650237295f68c195b74d888d95 (patch) | |
| tree | d7fa97e32f52862d91318f30bd4f3163aa8d7c61 /fs | |
| parent | 86b58d13134ef14f09f8c8f37797ccc37cf823a3 (diff) | |
| download | linux-stable-56f91aad69444d650237295f68c195b74d888d95.tar.gz linux-stable-56f91aad69444d650237295f68c195b74d888d95.tar.bz2 linux-stable-56f91aad69444d650237295f68c195b74d888d95.zip | |
ceph: Avoid data inconsistency due to d-cache aliasing in readpage()
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/addr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 1e561c059539..ec3ba43b9faa 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -210,9 +210,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); |