lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFS41: send real read size in layoutget

Browse Source 
For buffer read, use offst-to-isize.

For direct read, use dreq->bytes_left.

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Peng Tao
2012-09-25 14:55:57 +08:00
committed by Trond Myklebust
parent 6296556f0b
commit 1fd937bd75
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfs/pnfs.c
View File

@@ -1220,16 +1220,24 @@ out_forget_reply:
void void
pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) 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); BUG_ON(pgio->pg_lseg != NULL);
if (req->wb_offset != req->wb_pgbase) { if (req->wb_offset != req->wb_pgbase) {
nfs_pageio_reset_read_mds(pgio); nfs_pageio_reset_read_mds(pgio);
return; 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, pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
req->wb_context, req->wb_context,
req_offset(req), req_offset(req),
req->wb_bytes, rd_size,
IOMODE_READ, IOMODE_READ,
GFP_KERNEL); GFP_KERNEL);
/* If no lseg, fall back to read through mds */ /* If no lseg, fall back to read through mds */