Commit 1fd937bd authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

NFS41: send real read size in layoutget 



For buffer read, use offst-to-isize.

For direct read, use dreq->bytes_left.

Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 6296556f

fs/nfs/pnfs.c

+9 −1
Original line number Diff line number Diff line
@@ -1220,16 +1220,24 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
void

pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

{

	u64 rd_size = req->wb_bytes;



	BUG_ON(pgio->pg_lseg != NULL);



	if (req->wb_offset != req->wb_pgbase) {

		nfs_pageio_reset_read_mds(pgio);

		return;

	}



	if (pgio->pg_dreq == NULL)

		rd_size = i_size_read(pgio->pg_inode) - req_offset(req);

	else

		rd_size = nfs_dreq_bytes_left(pgio->pg_dreq);



	pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

					   req->wb_context,

					   req_offset(req),

					   req->wb_bytes,

					   rd_size,

					   IOMODE_READ,

					   GFP_KERNEL);

	/* If no lseg, fall back to read through mds */