Commit 7c46b318 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: rework PageFsCache handling 



With the new fscache API, the PageFsCache bit now indicates that the
page is being written to the cache and shouldn't be modified or released
until it's finished.

Change releasepage and invalidatepage to wait on that bit before
returning.

Also define FSCACHE_USE_NEW_IO_API so that we opt into the new fscache
API.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent e7df4524

fs/ceph/addr.c

+8 −1
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ static void ceph_invalidatepage(struct page *page, unsigned int offset, 
	struct ceph_inode_info *ci;

	struct ceph_snap_context *snapc = page_snap_context(page);



	wait_on_page_fscache(page);



	inode = page->mapping->host;

	ci = ceph_inode(inode);
@@ -168,11 +170,16 @@ static void ceph_invalidatepage(struct page *page, unsigned int offset, 
	ClearPagePrivate(page);

}



static int ceph_releasepage(struct page *page, gfp_t g)

static int ceph_releasepage(struct page *page, gfp_t gfp)

{

	dout("%p releasepage %p idx %lu (%sdirty)\n", page->mapping->host,

	     page, page->index, PageDirty(page) ? "" : "not ");



	if (PageFsCache(page)) {

		if (!(gfp & __GFP_DIRECT_RECLAIM) || !(gfp & __GFP_FS))

			return 0;

		wait_on_page_fscache(page);

	}

	return !PagePrivate(page);

}

fs/ceph/super.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/ceph/libceph.h>



#ifdef CONFIG_CEPH_FSCACHE

#define FSCACHE_USE_NEW_IO_API

#include <linux/fscache.h>

#endif