summaryrefslogtreecommitdiffstats
path: root/fs/ceph/cache.c
diff options
context:
space:
mode:
authorMilosz Tanski <milosz@adfin.com>2013-09-04 01:11:01 +0200
committerMilosz Tanski <milosz@adfin.com>2013-09-06 18:50:12 +0200
commit9b8dd1e8a55a12b67240b6b28160ac8c1dec0172 (patch)
tree34f7988fc45a0fb94431b9752c6b4b4452613758 /fs/ceph/cache.c
parentceph: clean PgPrivate2 on returning from readpages (diff)
downloadlinux-9b8dd1e8a55a12b67240b6b28160ac8c1dec0172.tar.xz
linux-9b8dd1e8a55a12b67240b6b28160ac8c1dec0172.zip
ceph: ceph_readpage_to_fscache didn't check if marked
Previously ceph_readpage_to_fscache did not call if page was marked as cached before calling fscache_write_page resulting in a BUG inside of fscache. FS-Cache: Assertion failed ------------[ cut here ]------------ kernel BUG at fs/fscache/page.c:874! invalid opcode: 0000 [#1] SMP Call Trace: [<ffffffffa02e6566>] __ceph_readpage_to_fscache+0x66/0x80 [ceph] [<ffffffffa02caf84>] readpage_nounlock+0x124/0x210 [ceph] [<ffffffffa02cb08d>] ceph_readpage+0x1d/0x40 [ceph] [<ffffffff81126db6>] generic_file_aio_read+0x1f6/0x700 [<ffffffffa02c6fcc>] ceph_aio_read+0x5fc/0xab0 [ceph] Signed-off-by: Milosz Tanski <milosz@adfin.com> Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph/cache.c')
-rw-r--r--fs/ceph/cache.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
index 5c413ecf1f15..c737ae9893ef 100644
--- a/fs/ceph/cache.c
+++ b/fs/ceph/cache.c
@@ -311,6 +311,9 @@ void ceph_readpage_to_fscache(struct inode *inode, struct page *page)
struct ceph_inode_info *ci = ceph_inode(inode);
int ret;
+ if (!PageFsCache(page))
+ return;
+
if (!cache_valid(ci))
return;