From: Andy Adamson <andros@xxxxxxxxxx> Prepare to remove unused get_read_threshold io operation. Squash into: "pnfs:filelayout:pg_test" Signed-off-by: Andy Adamson <andros@xxxxxxxxxx> --- fs/nfs/nfs4filelayout.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index c2dda25..dfc5149 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -712,8 +712,7 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, if (!pgio->pg_iswrite) goto boundary; - if (pgio->pg_bsize != NFS_SERVER(pgio->pg_inode)->wsize && - pgio->pg_count > pgio->pg_threshold) + if (pgio->pg_bsize != NFS_SERVER(pgio->pg_inode)->wsize) pgio->pg_bsize = NFS_SERVER(pgio->pg_inode)->wsize; boundary: -- 1.6.6 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html