leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: pass nfsd4_compound_state* to nfs4_preprocess_{state,seq}id_op

Browse Source 
Currently we only use cstate->current_fh,
will also be used by nfsd41 code.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Benny Halevy 2009-04-03 08:28:41 +03:00 committed by J. Bruce Fields
parent e10e0cfc2f
commit dd453dfd70
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/nfs4proc.c
View File

@ -513,9 +513,8 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
nfs4_lock_state(); nfs4_lock_state();
/* check stateid */ /* check stateid */
if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh, if ((status = nfs4_preprocess_stateid_op(cstate, &read->rd_stateid,
&read->rd_stateid, RD_STATE, &read->rd_filp))) {
RD_STATE, &read->rd_filp))) {
dprintk("NFSD: nfsd4_read: couldn't process stateid!\n"); dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");
goto out; goto out;
} }
@ -646,7 +645,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (setattr->sa_iattr.ia_valid & ATTR_SIZE) { if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
nfs4_lock_state(); nfs4_lock_state();
status = nfs4_preprocess_stateid_op(&cstate->current_fh, status = nfs4_preprocess_stateid_op(cstate,
&setattr->sa_stateid, WR_STATE, NULL); &setattr->sa_stateid, WR_STATE, NULL);
nfs4_unlock_state(); nfs4_unlock_state();
if (status) { if (status) {
@ -686,8 +685,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
return nfserr_inval; return nfserr_inval;
nfs4_lock_state(); nfs4_lock_state();
status = nfs4_preprocess_stateid_op(&cstate->current_fh, stateid, status = nfs4_preprocess_stateid_op(cstate, stateid, WR_STATE, &filp);
WR_STATE, &filp);
if (filp) if (filp)
get_file(filp); get_file(filp);
nfs4_unlock_state(); nfs4_unlock_state();

22
fs/nfsd/nfs4state.c
View File

@ -2810,10 +2810,12 @@ static int is_delegation_stateid(stateid_t *stateid)
* Checks for stateid operations * Checks for stateid operations
*/ */
__be32 __be32
nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int flags, struct file **filpp) nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
stateid_t *stateid, int flags, struct file **filpp)
{ {
struct nfs4_stateid *stp = NULL; struct nfs4_stateid *stp = NULL;
struct nfs4_delegation *dp = NULL; struct nfs4_delegation *dp = NULL;
struct svc_fh *current_fh = &cstate->current_fh;
struct inode *ino = current_fh->fh_dentry->d_inode; struct inode *ino = current_fh->fh_dentry->d_inode;
__be32 status; __be32 status;
@ -2878,10 +2880,14 @@ setlkflg (int type)
* Checks for sequence id mutating operations. * Checks for sequence id mutating operations.
*/ */
static __be32 static __be32
nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateid, int flags, struct nfs4_stateowner **sopp, struct nfs4_stateid **stpp, struct nfsd4_lock *lock) nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid,
stateid_t *stateid, int flags,
struct nfs4_stateowner **sopp,
struct nfs4_stateid **stpp, struct nfsd4_lock *lock)
{ {
struct nfs4_stateid *stp; struct nfs4_stateid *stp;
struct nfs4_stateowner *sop; struct nfs4_stateowner *sop;
struct svc_fh *current_fh = &cstate->current_fh;
__be32 status; __be32 status;
dprintk("NFSD: preprocess_seqid_op: seqid=%d " dprintk("NFSD: preprocess_seqid_op: seqid=%d "
@ -3004,7 +3010,7 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
nfs4_lock_state(); nfs4_lock_state();
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(cstate,
oc->oc_seqid, &oc->oc_req_stateid, oc->oc_seqid, &oc->oc_req_stateid,
CONFIRM | OPEN_STATE, CONFIRM | OPEN_STATE,
&oc->oc_stateowner, &stp, NULL))) &oc->oc_stateowner, &stp, NULL)))
@ -3074,7 +3080,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
return nfserr_inval; return nfserr_inval;
nfs4_lock_state(); nfs4_lock_state();
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(cstate,
od->od_seqid, od->od_seqid,
&od->od_stateid, &od->od_stateid,
OPEN_STATE, OPEN_STATE,
@ -3127,7 +3133,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
nfs4_lock_state(); nfs4_lock_state();
/* check close_lru for replay */ /* check close_lru for replay */
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(cstate,
close->cl_seqid, close->cl_seqid,
&close->cl_stateid, &close->cl_stateid,
OPEN_STATE | CLOSE_STATE, OPEN_STATE | CLOSE_STATE,
@ -3474,7 +3480,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out; goto out;
/* validate and update open stateid and open seqid */ /* validate and update open stateid and open seqid */
status = nfs4_preprocess_seqid_op(&cstate->current_fh, status = nfs4_preprocess_seqid_op(cstate,
lock->lk_new_open_seqid, lock->lk_new_open_seqid,
&lock->lk_new_open_stateid, &lock->lk_new_open_stateid,
OPEN_STATE, OPEN_STATE,
@ -3501,7 +3507,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out; goto out;
} else { } else {
/* lock (lock owner + lock stateid) already exists */ /* lock (lock owner + lock stateid) already exists */
status = nfs4_preprocess_seqid_op(&cstate->current_fh, status = nfs4_preprocess_seqid_op(cstate,
lock->lk_old_lock_seqid, lock->lk_old_lock_seqid,
&lock->lk_old_lock_stateid, &lock->lk_old_lock_stateid,
LOCK_STATE, LOCK_STATE,
@ -3697,7 +3703,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
nfs4_lock_state(); nfs4_lock_state();
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(cstate,
locku->lu_seqid, locku->lu_seqid,
&locku->lu_stateid, &locku->lu_stateid,
LOCK_STATE, LOCK_STATE,

4
include/linux/nfsd/state.h
View File

@ -333,7 +333,9 @@ struct nfs4_stateid {
((err) != nfserr_stale_stateid) && \ ((err) != nfserr_stale_stateid) && \
((err) != nfserr_bad_stateid)) ((err) != nfserr_bad_stateid))
extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh, struct nfsd4_compound_state;
extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
stateid_t *stateid, int flags, struct file **filp); stateid_t *stateid, int flags, struct file **filp);
extern void nfs4_lock_state(void); extern void nfs4_lock_state(void);
extern void nfs4_unlock_state(void); extern void nfs4_unlock_state(void);