From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 26 Feb 2016 08:27:13 +0000 (+0800)
Subject: ceph: fix race during filling readdir cache
X-Git-Tag: v4.6-rc1~1^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=af5e5eb574776cdf1b756a27cc437bff257e22fe;p=users%2Fjedix%2Flinux-maple.git

ceph: fix race during filling readdir cache

Readdir cache uses page cache to save dentry pointers. When adding
dentry pointers to middle of a page, we need to make sure the page
already exists. Otherwise the beginning part of the page will be
invalid pointers.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index cec68a6e20df..495decfc4b34 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1349,15 +1349,20 @@ static int fill_readdir_cache(struct inode *dir, struct dentry *dn,
 
 	if (!ctl->page || pgoff != page_index(ctl->page)) {
 		ceph_readdir_cache_release(ctl);
-		ctl->page  = grab_cache_page(&dir->i_data, pgoff);
+		if (idx == 0)
+			ctl->page = grab_cache_page(&dir->i_data, pgoff);
+		else
+			ctl->page = find_lock_page(&dir->i_data, pgoff);
 		if (!ctl->page) {
 			ctl->index = -1;
-			return -ENOMEM;
+			return idx == 0 ? -ENOMEM : 0;
 		}
 		/* reading/filling the cache are serialized by
 		 * i_mutex, no need to use page lock */
 		unlock_page(ctl->page);
 		ctl->dentries = kmap(ctl->page);
+		if (idx == 0)
+			memset(ctl->dentries, 0, PAGE_CACHE_SIZE);
 	}
 
 	if (req->r_dir_release_cnt == atomic64_read(&ci->i_release_count) &&