adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

nfsd4: use helper for copying filehandles for replay

Browse source 
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2009-02-02 17:23:10 -05:00
parent 13024b7b40
commit a4773c08f2
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs/nfsd/nfs4proc.c
View file

@ -123,10 +123,8 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
fh_dup2(current_fh, &resfh); fh_dup2(current_fh, &resfh);
/* set reply cache */ /* set reply cache */
open->op_stateowner->so_replay.rp_openfh_len = resfh.fh_handle.fh_size; fh_copy_shallow(&open->op_stateowner->so_replay.rp_openfh,
memcpy(open->op_stateowner->so_replay.rp_openfh, &resfh.fh_handle);
&resfh.fh_handle.fh_base, resfh.fh_handle.fh_size);
if (!created) if (!created)
status = do_open_permission(rqstp, current_fh, open, status = do_open_permission(rqstp, current_fh, open,
NFSD_MAY_NOP); NFSD_MAY_NOP);
@ -152,10 +150,8 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_
memset(&open->op_cinfo, 0, sizeof(struct nfsd4_change_info)); memset(&open->op_cinfo, 0, sizeof(struct nfsd4_change_info));
/* set replay cache */ /* set replay cache */
open->op_stateowner->so_replay.rp_openfh_len = current_fh->fh_handle.fh_size; fh_copy_shallow(&open->op_stateowner->so_replay.rp_openfh,
memcpy(open->op_stateowner->so_replay.rp_openfh, &current_fh->fh_handle);
&current_fh->fh_handle.fh_base,
current_fh->fh_handle.fh_size);
open->op_truncate = (open->op_iattr.ia_valid & ATTR_SIZE) && open->op_truncate = (open->op_iattr.ia_valid & ATTR_SIZE) &&
(open->op_iattr.ia_size == 0); (open->op_iattr.ia_size == 0);
@ -187,9 +183,8 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (status == nfserr_replay_me) { if (status == nfserr_replay_me) {
struct nfs4_replay *rp = &open->op_stateowner->so_replay; struct nfs4_replay *rp = &open->op_stateowner->so_replay;
fh_put(&cstate->current_fh); fh_put(&cstate->current_fh);
cstate->current_fh.fh_handle.fh_size = rp->rp_openfh_len; fh_copy_shallow(&cstate->current_fh.fh_handle,
memcpy(&cstate->current_fh.fh_handle.fh_base, rp->rp_openfh, &rp->rp_openfh);
rp->rp_openfh_len);
status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP); status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
if (status) if (status)
dprintk("nfsd4_open: replay failed" dprintk("nfsd4_open: replay failed"

7
include/linux/nfsd/nfsfh.h
View file

@ -269,6 +269,13 @@ fh_copy(struct svc_fh *dst, struct svc_fh *src)
return dst; return dst;
} }
static inline void
fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src)
{
dst->fh_size = src->fh_size;
memcpy(&dst->fh_base, &src->fh_base, src->fh_size);
}
static __inline__ struct svc_fh * static __inline__ struct svc_fh *
fh_init(struct svc_fh *fhp, int maxsize) fh_init(struct svc_fh *fhp, int maxsize)
{ {

3
include/linux/nfsd/state.h
View file

@ -168,8 +168,7 @@ struct nfs4_replay {
unsigned int rp_buflen; unsigned int rp_buflen;
char *rp_buf; char *rp_buf;
unsigned intrp_allocated; unsigned intrp_allocated;
int rp_openfh_len; struct knfsd_fh rp_openfh;
char rp_openfh[NFS4_FHSIZE];
char rp_ibuf[NFSD4_REPLAY_ISIZE]; char rp_ibuf[NFSD4_REPLAY_ISIZE];
}; };