Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18ad0a9f authored by Benny Halevy's avatar Benny Halevy Committed by Boaz Harrosh
Browse files

NFSv4.1: change pg_test return type to bool 



Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
parent dfed206b

fs/nfs/nfs4filelayout.c

+3 −3
Original line number Diff line number Diff line
@@ -651,10 +651,10 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, 
/*

 * filelayout_pg_test(). Called by nfs_can_coalesce_requests()

 *

 * return 1 :  coalesce page

 * return 0 :  don't coalesce page

 * return true  : coalesce page

 * return false : don't coalesce page

 */

int

bool

filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,

		   struct nfs_page *req)

{

fs/nfs/objlayout/objio_osd.c

+3 −4
Original line number Diff line number Diff line
@@ -991,14 +991,13 @@ ssize_t objio_write_pagelist(struct objlayout_io_state *ol_state, bool stable) 
/*

 * objlayout_pg_test(). Called by nfs_can_coalesce_requests()

 *

 * return 1 :  coalesce page

 * return 0 :  don't coalesce page

 * return true iff coalesce page

 */

int

bool

objlayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,

		   struct nfs_page *req)

{

	return 1;

	return true;

}



static struct pnfs_layoutdriver_type objlayout_type = {

fs/nfs/pagelist.c

+11 −11
Original line number Diff line number Diff line
@@ -244,29 +244,29 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, 
 *

 * Return 'true' if this is the case, else return 'false'.

 */

static int nfs_can_coalesce_requests(struct nfs_page *prev,

static bool nfs_can_coalesce_requests(struct nfs_page *prev,

				      struct nfs_page *req,

				      struct nfs_pageio_descriptor *pgio)

{

	if (req->wb_context->cred != prev->wb_context->cred)

		return 0;

		return false;

	if (req->wb_lock_context->lockowner != prev->wb_lock_context->lockowner)

		return 0;

		return false;

	if (req->wb_context->state != prev->wb_context->state)

		return 0;

		return false;

	if (req->wb_index != (prev->wb_index + 1))

		return 0;

		return false;

	if (req->wb_pgbase != 0)

		return 0;

		return false;

	if (prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE)

		return 0;

		return false;

	/*

	 * Non-whole file layouts need to check that req is inside of

	 * pgio->pg_lseg.

	 */

	if (pgio->pg_test && !pgio->pg_test(pgio, prev, req))

		return 0;

	return 1;

		return false;

	return true;

}



/**

fs/nfs/pnfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
	goto out;

}



int

bool

pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,

		     struct nfs_page *req)

{
@@ -1070,7 +1070,7 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, 
	} else if (pgio->pg_lseg &&

		   req_offset(req) > end_offset(pgio->pg_lseg->pls_range.offset,

						pgio->pg_lseg->pls_range.length))

		return 0;

		return false;

	return NFS_SERVER(pgio->pg_inode)->pnfs_curr_ld->pg_test(pgio, prev, req);

}

fs/nfs/pnfs.h

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct pnfs_layoutdriver_type { 
	void (*free_lseg) (struct pnfs_layout_segment *lseg);



	/* test for nfs page cache coalescing */

	int (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);

	bool (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);



	/* Returns true if layoutdriver wants to divert this request to

	 * driver's commit routine.
@@ -158,7 +158,7 @@ enum pnfs_try_status pnfs_try_to_write_data(struct nfs_write_data *, 
					     const struct rpc_call_ops *, int);

enum pnfs_try_status pnfs_try_to_read_data(struct nfs_read_data *,

					    const struct rpc_call_ops *);

int pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req);

bool pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req);

int pnfs_layout_process(struct nfs4_layoutget *lgp);

void pnfs_free_lseg_list(struct list_head *tmp_list);

void pnfs_destroy_layout(struct nfs_inode *);