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

Commit b4fdac1a authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

nfs: modify pg_test interface to return size_t 



This is a step toward allowing pg_test to inform the the
coalescing code to reduce the size of requests so they may fit in
whatever scheme the pg_test callback wants to define.

For now, just return the size of the request if there is space, or 0
if there is not.  This shouldn't change any behavior as it acts
the same as when the pg_test functions returned bool.

Signed-off-by: default avatarWeston Andros Adamson <dros@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 8c8f1ac1

fs/nfs/blocklayout/blocklayout.c

+12 −4
Original line number Diff line number Diff line
@@ -1189,13 +1189,17 @@ bl_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) 
		pnfs_generic_pg_init_read(pgio, req);

}



static bool

/*

 * Return 0 if @req cannot be coalesced into @pgio, otherwise return the number

 * of bytes (maximum @req->wb_bytes) that can be coalesced.

 */

static size_t

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

		struct nfs_page *req)

{

	if (pgio->pg_dreq != NULL &&

	    !is_aligned_req(req, SECTOR_SIZE))

		return false;

		return 0;



	return pnfs_generic_pg_test(pgio, prev, req);

}
@@ -1241,13 +1245,17 @@ bl_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) 
	}

}



static bool

/*

 * Return 0 if @req cannot be coalesced into @pgio, otherwise return the number

 * of bytes (maximum @req->wb_bytes) that can be coalesced.

 */

static size_t

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

		 struct nfs_page *req)

{

	if (pgio->pg_dreq != NULL &&

	    !is_aligned_req(req, PAGE_CACHE_SIZE))

		return false;

		return 0;



	return pnfs_generic_pg_test(pgio, prev, req);

}

fs/nfs/nfs4filelayout.c

+7 −5
Original line number Diff line number Diff line
@@ -915,10 +915,10 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, 
/*

 * filelayout_pg_test(). Called by nfs_can_coalesce_requests()

 *

 * return true  : coalesce page

 * return false : don't coalesce page

 * Return 0 if @req cannot be coalesced into @pgio, otherwise return the number

 * of bytes (maximum @req->wb_bytes) that can be coalesced.

 */

static bool

static size_t

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

		   struct nfs_page *req)

{
@@ -927,7 +927,7 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, 


	if (!pnfs_generic_pg_test(pgio, prev, req) ||

	    !nfs_generic_pg_test(pgio, prev, req))

		return false;

		return 0;



	p_stripe = (u64)req_offset(prev);

	r_stripe = (u64)req_offset(req);
@@ -936,7 +936,9 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, 
	do_div(p_stripe, stripe_unit);

	do_div(r_stripe, stripe_unit);



	return (p_stripe == r_stripe);

	if (p_stripe == r_stripe)

		return req->wb_bytes;

	return 0;

}



static void

fs/nfs/objlayout/objio_osd.c

+10 −5
Original line number Diff line number Diff line
@@ -564,14 +564,19 @@ int objio_write_pagelist(struct nfs_pgio_data *wdata, int how) 
	return 0;

}



static bool objio_pg_test(struct nfs_pageio_descriptor *pgio,

/*

 * Return 0 if @req cannot be coalesced into @pgio, otherwise return the number

 * of bytes (maximum @req->wb_bytes) that can be coalesced.

 */

static size_t objio_pg_test(struct nfs_pageio_descriptor *pgio,

			  struct nfs_page *prev, struct nfs_page *req)

{

	if (!pnfs_generic_pg_test(pgio, prev, req))

		return false;

	if (!pnfs_generic_pg_test(pgio, prev, req) ||

	    pgio->pg_count + req->wb_bytes >

	    (unsigned long)pgio->pg_layout_private)

		return 0;



	return pgio->pg_count + req->wb_bytes <=

			(unsigned long)pgio->pg_layout_private;

	return req->wb_bytes;

}



static void objio_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

fs/nfs/pagelist.c

+19 −3
Original line number Diff line number Diff line
@@ -280,7 +280,17 @@ nfs_wait_on_request(struct nfs_page *req) 
			TASK_UNINTERRUPTIBLE);

}



bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, struct nfs_page *prev, struct nfs_page *req)

/*

 * nfs_generic_pg_test - determine if requests can be coalesced

 * @desc: pointer to descriptor

 * @prev: previous request in desc, or NULL

 * @req: this request

 *

 * Returns zero if @req can be coalesced into @desc, otherwise it returns

 * the size of the request.

 */

size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,

			   struct nfs_page *prev, struct nfs_page *req)

{

	/*

	 * FIXME: ideally we should be able to coalesce all requests
@@ -292,7 +302,9 @@ bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, struct nfs_page *pr 
	if (desc->pg_bsize < PAGE_SIZE)

		return 0;



	return desc->pg_count + req->wb_bytes <= desc->pg_bsize;

	if (desc->pg_count + req->wb_bytes <= desc->pg_bsize)

		return req->wb_bytes;

	return 0;

}

EXPORT_SYMBOL_GPL(nfs_generic_pg_test);
@@ -747,6 +759,8 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, 
				      struct nfs_page *req,

				      struct nfs_pageio_descriptor *pgio)

{

	size_t size;



	if (!nfs_match_open_context(req->wb_context, prev->wb_context))

		return false;

	if (req->wb_context->dentry->d_inode->i_flock != NULL &&
@@ -758,7 +772,9 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, 
		return false;

	if (req_offset(req) != req_offset(prev) + prev->wb_bytes)

		return false;

	return pgio->pg_ops->pg_test(pgio, prev, req);

	size = pgio->pg_ops->pg_test(pgio, prev, req);

	WARN_ON_ONCE(size && size != req->wb_bytes);

	return size > 0;

}



/**

fs/nfs/pnfs.c

+9 −3
Original line number Diff line number Diff line
@@ -1434,7 +1434,11 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, 
}

EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_write);



bool

/*

 * Return 0 if @req cannot be coalesced into @pgio, otherwise return the number

 * of bytes (maximum @req->wb_bytes) that can be coalesced.

 */

size_t

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

		     struct nfs_page *req)

{
@@ -1455,8 +1459,10 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, 
	 * first byte that lies outside the pnfs_layout_range. FIXME?

	 *

	 */

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

					 pgio->pg_lseg->pls_range.length);

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

					 pgio->pg_lseg->pls_range.length))

		return req->wb_bytes;

	return 0;

}

EXPORT_SYMBOL_GPL(pnfs_generic_pg_test);