Commit 76be778b authored by Milosz Tanski's avatar Milosz Tanski

ceph: clean PgPrivate2 on returning from readpages

In some cases the ceph readapages code code bails without filling all the pages
already marked by fscache. When we return back to readahead code this causes
a BUG.
Signed-off-by: default avatarMilosz Tanski <milosz@adfin.com>
parent 99ccbd22
...@@ -398,6 +398,8 @@ static int ceph_readpages(struct file *file, struct address_space *mapping, ...@@ -398,6 +398,8 @@ static int ceph_readpages(struct file *file, struct address_space *mapping,
BUG_ON(rc == 0); BUG_ON(rc == 0);
} }
out: out:
ceph_fscache_readpages_cancel(inode, page_list);
dout("readpages %p file %p ret %d\n", inode, file, rc); dout("readpages %p file %p ret %d\n", inode, file, rc);
return rc; return rc;
} }
......
...@@ -58,6 +58,13 @@ static inline int ceph_release_fscache_page(struct page *page, gfp_t gfp) ...@@ -58,6 +58,13 @@ static inline int ceph_release_fscache_page(struct page *page, gfp_t gfp)
return fscache_maybe_release_page(ci->fscache, page, gfp); return fscache_maybe_release_page(ci->fscache, page, gfp);
} }
static inline void ceph_fscache_readpages_cancel(struct inode *inode,
struct list_head *pages)
{
struct ceph_inode_info *ci = ceph_inode(inode);
return fscache_readpages_cancel(ci->fscache, pages);
}
#else #else
static inline int ceph_fscache_register(void) static inline int ceph_fscache_register(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment