dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

pnfs-obj: Remove redundant EOF from objlayout_io_state 

The EOF calculation was done on .read_pagelist(), cached
in objlayout_io_state->eof, and set in objlayout_read_done()
into nfs_read_data->res.eof.

So set it directly into nfs_read_data->res.eof and avoid
the extra member.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Boaz Harrosh 2011-10-31 14:45:06 -07:00 committed by Trond Myklebust
parent 994c0e9925
commit 4cdc685c7d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfs/objlayout/objlayout.c
View File

@ -287,17 +287,14 @@ static void _rpc_read_complete(struct work_struct *work)
void
objlayout_read_done(struct objlayout_io_state *state, ssize_t status, bool sync)
{
int eof = state->eof;
struct nfs_read_data *rdata;
struct nfs_read_data *rdata = state->rpcdata;
state->status = status;
dprintk("%s: Begin status=%zd eof=%d\n", __func__, status, eof);
rdata = state->rpcdata;
dprintk("%s: Begin status=%zd eof=%d\n", __func__,
status, rdata->res.eof);
rdata->task.tk_status = status;
if (status >= 0) {
if (status >= 0)
rdata->res.count = status;
rdata->res.eof = eof;
}
objlayout_iodone(state);
/* must not use state after this point */
@ -330,11 +327,14 @@ objlayout_read_pagelist(struct nfs_read_data *rdata)
status = 0;
rdata->res.count = 0;
rdata->res.eof = 1;
/*FIXME: do we need to call pnfs_ld_read_done() */
goto out;
}
count = eof - offset;
}
rdata->res.eof = (offset + count) >= eof;
state = objlayout_alloc_io_state(NFS_I(rdata->inode)->layout,
rdata->args.pages, rdata->args.pgbase,
offset, count,
@ -345,8 +345,6 @@ objlayout_read_pagelist(struct nfs_read_data *rdata)
goto out;
}
state->eof = state->offset + state->count >= eof;
status = objio_read_pagelist(state);
out:
dprintk("%s: Return status %Zd\n", __func__, status);

1
fs/nfs/objlayout/objlayout.h
View File

@ -86,7 +86,6 @@ struct objlayout_io_state {
void *rpcdata;
int status; /* res */
int eof; /* res */
int committed; /* res */
/* Error reporting (layout_return) */