Commit fc1c5abf authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Trond Myklebust
Browse files

NFS: Rename fscache read and write pages functions 



Rename NFS fscache functions in a more consistent fashion
to better reflect when we read from and write to fscache.

Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 45f3a70b

fs/nfs/fscache.c

+3 −3
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int fscache_fallback_write_page(struct inode *inode, struct page *page, 
/*

 * Retrieve a page from fscache

 */

int __nfs_readpage_from_fscache(struct inode *inode, struct page *page)

int __nfs_fscache_read_page(struct inode *inode, struct page *page)

{

	int ret;
@@ -351,7 +351,7 @@ int __nfs_readpage_from_fscache(struct inode *inode, struct page *page) 
 * Store a newly fetched page in fscache.  We can be certain there's no page

 * stored in the cache as yet otherwise we would've read it from there.

 */

void __nfs_readpage_to_fscache(struct inode *inode, struct page *page)

void __nfs_fscache_write_page(struct inode *inode, struct page *page)

{

	int ret;
@@ -362,7 +362,7 @@ void __nfs_readpage_to_fscache(struct inode *inode, struct page *page) 
	ret = fscache_fallback_write_page(inode, page, true);



	dfprintk(FSCACHE,

		 "NFS:     readpage_to_fscache: p:%p(i:%lu f:%lx) ret %d\n",

		 "NFS:     nfs_fscache_write_page: p:%p(i:%lu f:%lx) ret %d\n",

		 page, page->index, page->flags, ret);



	if (ret != 0) {

fs/nfs/fscache.h

+10 −17
Original line number Diff line number Diff line
@@ -45,10 +45,8 @@ extern void nfs_fscache_clear_inode(struct inode *); 
extern void nfs_fscache_open_file(struct inode *, struct file *);

extern void nfs_fscache_release_file(struct inode *, struct file *);



extern int __nfs_readpage_from_fscache(struct inode *, struct page *);

extern void __nfs_read_completion_to_fscache(struct nfs_pgio_header *hdr,

					     unsigned long bytes);

extern void __nfs_readpage_to_fscache(struct inode *, struct page *);

extern int __nfs_fscache_read_page(struct inode *, struct page *);

extern void __nfs_fscache_write_page(struct inode *, struct page *);



static inline int nfs_fscache_release_page(struct page *page, gfp_t gfp)

{
@@ -66,11 +64,10 @@ static inline int nfs_fscache_release_page(struct page *page, gfp_t gfp) 
/*

 * Retrieve a page from an inode data storage object.

 */

static inline int nfs_readpage_from_fscache(struct inode *inode,

					    struct page *page)

static inline int nfs_fscache_read_page(struct inode *inode, struct page *page)

{

	if (NFS_I(inode)->fscache)

		return __nfs_readpage_from_fscache(inode, page);

	if (nfs_i_fscache(inode))

		return __nfs_fscache_read_page(inode, page);

	return -ENOBUFS;

}
@@ -78,11 +75,11 @@ static inline int nfs_readpage_from_fscache(struct inode *inode, 
 * Store a page newly fetched from the server in an inode data storage object

 * in the cache.

 */

static inline void nfs_readpage_to_fscache(struct inode *inode,

static inline void nfs_fscache_write_page(struct inode *inode,

					   struct page *page)

{

	if (NFS_I(inode)->fscache)

		__nfs_readpage_to_fscache(inode, page);

	if (nfs_i_fscache(inode))

		__nfs_fscache_write_page(inode, page);

}



static inline void nfs_fscache_update_auxdata(struct nfs_fscache_inode_auxdata *auxdata,
@@ -136,15 +133,11 @@ static inline int nfs_fscache_release_page(struct page *page, gfp_t gfp) 
{

	return 1; /* True: may release page */

}

static inline int nfs_readpage_from_fscache(struct inode *inode,

					    struct page *page)

static inline int nfs_fscache_read_page(struct inode *inode, struct page *page)

{

	return -ENOBUFS;

}

static inline void nfs_readpage_to_fscache(struct inode *inode,

					   struct page *page) {}





static inline void nfs_fscache_write_page(struct inode *inode, struct page *page) {}

static inline void nfs_fscache_invalidate(struct inode *inode, int flags) {}



static inline const char *nfs_server_fscache_state(struct nfs_server *server)

fs/nfs/read.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void nfs_readpage_release(struct nfs_page *req, int error) 
		struct address_space *mapping = page_file_mapping(page);



		if (PageUptodate(page))

			nfs_readpage_to_fscache(inode, page);

			nfs_fscache_write_page(inode, page);

		else if (!PageError(page) && !PagePrivate(page))

			generic_error_remove_page(mapping, page);

		unlock_page(page);
@@ -305,7 +305,7 @@ readpage_async_filler(struct nfs_readdesc *desc, struct page *page) 
	aligned_len = min_t(unsigned int, ALIGN(len, rsize), PAGE_SIZE);



	if (!IS_SYNC(page->mapping->host)) {

		error = nfs_readpage_from_fscache(page->mapping->host, page);

		error = nfs_fscache_read_page(page->mapping->host, page);

		if (error == 0)

			goto out_unlock;

	}