Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfs: chain calls to pg_test

Browse Source 
Now that pg_test can change the size of the request (by returning a non-zero
size smaller than the request), pg_test functions that call other
pg_test functions must return the minimum of the result - or 0 if any fail.

Also clean up the logic of some pg_test functions so that all checks are
for contitions where coalescing is not possible.

Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Weston Andros Adamson 2014-05-15 11:56:51 -04:00 committed by Trond Myklebust
parent 6094f83864
commit 0f9c429eca
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/nfs/nfs4filelayout.c
View File

@ -928,26 +928,27 @@ static size_t
filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
struct nfs_page *req) struct nfs_page *req)
{ {
unsigned int size;
u64 p_stripe, r_stripe; u64 p_stripe, r_stripe;
u32 stripe_unit; u32 stripe_unit;
if (!pnfs_generic_pg_test(pgio, prev, req) || /* calls nfs_generic_pg_test */
!nfs_generic_pg_test(pgio, prev, req)) size = pnfs_generic_pg_test(pgio, prev, req);
if (!size)
return 0; return 0;
if (!prev) if (prev) {
return req->wb_bytes; p_stripe = (u64)req_offset(prev);
r_stripe = (u64)req_offset(req);
stripe_unit = FILELAYOUT_LSEG(pgio->pg_lseg)->stripe_unit;
p_stripe = (u64)req_offset(prev); do_div(p_stripe, stripe_unit);
r_stripe = (u64)req_offset(req); do_div(r_stripe, stripe_unit);
stripe_unit = FILELAYOUT_LSEG(pgio->pg_lseg)->stripe_unit;
do_div(p_stripe, stripe_unit); if (p_stripe != r_stripe)
do_div(r_stripe, stripe_unit); return 0;
}
if (p_stripe == r_stripe) return min(size, req->wb_bytes);
return req->wb_bytes;
return 0;
} }
static void static void

9
fs/nfs/objlayout/objio_osd.c
View File

@ -571,12 +571,15 @@ int objio_write_pagelist(struct nfs_pgio_data *wdata, int how)
static size_t objio_pg_test(struct nfs_pageio_descriptor *pgio, static size_t objio_pg_test(struct nfs_pageio_descriptor *pgio,
struct nfs_page *prev, struct nfs_page *req) struct nfs_page *prev, struct nfs_page *req)
{ {
if (!pnfs_generic_pg_test(pgio, prev, req) || unsigned int size;
pgio->pg_count + req->wb_bytes >
size = pnfs_generic_pg_test(pgio, prev, req);
if (!size || pgio->pg_count + req->wb_bytes >
(unsigned long)pgio->pg_layout_private) (unsigned long)pgio->pg_layout_private)
return 0; return 0;
return req->wb_bytes; return min(size, req->wb_bytes);
} }
static void objio_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) static void objio_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

15
fs/nfs/pnfs.c
View File

@ -1442,8 +1442,12 @@ size_t
pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
struct nfs_page *req) struct nfs_page *req)
{ {
if (pgio->pg_lseg == NULL) unsigned int size;
return nfs_generic_pg_test(pgio, prev, req);
size = nfs_generic_pg_test(pgio, prev, req);
if (!size)
return 0;
/* /*
* Test if a nfs_page is fully contained in the pnfs_layout_range. * Test if a nfs_page is fully contained in the pnfs_layout_range.
@ -1459,10 +1463,11 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
* first byte that lies outside the pnfs_layout_range. FIXME? * first byte that lies outside the pnfs_layout_range. FIXME?
* *
*/ */
if (req_offset(req) < end_offset(pgio->pg_lseg->pls_range.offset, if (req_offset(req) >= end_offset(pgio->pg_lseg->pls_range.offset,
pgio->pg_lseg->pls_range.length)) pgio->pg_lseg->pls_range.length))
return req->wb_bytes; return 0;
return 0;
return min(size, req->wb_bytes);
} }
EXPORT_SYMBOL_GPL(pnfs_generic_pg_test); EXPORT_SYMBOL_GPL(pnfs_generic_pg_test);