mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfsd41: use current stateid by value

Browse source 
Signed-off-by: Tigran Mkrtchyan <kofemann@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Tigran Mkrtchyan 2012-02-13 22:55:32 +01:00 committed by J. Bruce Fields
parent 9428fe1abb
commit 37c593c573
4 changed files with 33 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
fs/nfsd/current_stateid.h
View file

@ -4,6 +4,7 @@
#include "state.h" #include "state.h"
#include "xdr4.h" #include "xdr4.h"
extern void clear_current_stateid(struct nfsd4_compound_state *cstate);
/* /*
* functions to set current state id * functions to set current state id
*/ */

12
fs/nfsd/nfs4proc.c
View file

@ -453,7 +453,10 @@ nfsd4_restorefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
return nfserr_restorefh; return nfserr_restorefh;
fh_dup2(&cstate->current_fh, &cstate->save_fh); fh_dup2(&cstate->current_fh, &cstate->save_fh);
cstate->current_stateid = cstate->save_stateid; if (HAS_STATE_ID(cstate, SAVED_STATE_ID_FLAG)) {
memcpy(&cstate->current_stateid, &cstate->save_stateid, sizeof(stateid_t));
SET_STATE_ID(cstate, CURRENT_STATE_ID_FLAG);
}
return nfs_ok; return nfs_ok;
} }
@ -465,7 +468,10 @@ nfsd4_savefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
return nfserr_nofilehandle; return nfserr_nofilehandle;
fh_dup2(&cstate->save_fh, &cstate->current_fh); fh_dup2(&cstate->save_fh, &cstate->current_fh);
cstate->save_stateid = cstate->current_stateid; if (HAS_STATE_ID(cstate, CURRENT_STATE_ID_FLAG)) {
memcpy(&cstate->save_stateid, &cstate->current_stateid, sizeof(stateid_t));
SET_STATE_ID(cstate, SAVED_STATE_ID_FLAG);
}
return nfs_ok; return nfs_ok;
} }
@ -1238,7 +1244,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
opdesc->op_set_currentstateid(cstate, &op->u); opdesc->op_set_currentstateid(cstate, &op->u);
if (opdesc->op_flags & OP_CLEAR_STATEID) if (opdesc->op_flags & OP_CLEAR_STATEID)
cstate->current_stateid = NULL; clear_current_stateid(cstate);
if (need_wrongsec_check(rqstp)) if (need_wrongsec_check(rqstp))
op->status = check_nfsd_access(cstate->current_fh.fh_export, rqstp); op->status = check_nfsd_access(cstate->current_fh.fh_export, rqstp);

16
fs/nfsd/nfs4state.c
View file

@ -4699,15 +4699,23 @@ nfs4_state_shutdown(void)
static void static void
get_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid) get_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid)
{ {
if (cstate->current_stateid && CURRENT_STATEID(stateid)) if (HAS_STATE_ID(cstate, CURRENT_STATE_ID_FLAG) && CURRENT_STATEID(stateid))
memcpy(stateid, cstate->current_stateid, sizeof(stateid_t)); memcpy(stateid, &cstate->current_stateid, sizeof(stateid_t));
} }
static void static void
put_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid) put_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid)
{ {
if (cstate->minorversion) if (cstate->minorversion) {
cstate->current_stateid = stateid; memcpy(&cstate->current_stateid, stateid, sizeof(stateid_t));
SET_STATE_ID(cstate, CURRENT_STATE_ID_FLAG);
}
}
void
clear_current_stateid(struct nfsd4_compound_state *cstate)
{
CLEAR_STATE_ID(cstate, CURRENT_STATE_ID_FLAG);
} }
/* /*

13
fs/nfsd/xdr4.h
View file

@ -43,6 +43,13 @@
#define NFSD4_MAX_TAGLEN 128 #define NFSD4_MAX_TAGLEN 128
#define XDR_LEN(n) (((n) + 3) & ~3) #define XDR_LEN(n) (((n) + 3) & ~3)
#define CURRENT_STATE_ID_FLAG (1<<0)
#define SAVED_STATE_ID_FLAG (1<<1)
#define SET_STATE_ID(c, f) ((c)->sid_flags |= (f))
#define HAS_STATE_ID(c, f) ((c)->sid_flags & (f))
#define CLEAR_STATE_ID(c, f) ((c)->sid_flags &= ~(f))
struct nfsd4_compound_state { struct nfsd4_compound_state {
struct svc_fh current_fh; struct svc_fh current_fh;
struct svc_fh save_fh; struct svc_fh save_fh;
@ -54,8 +61,10 @@ struct nfsd4_compound_state {
size_t iovlen; size_t iovlen;
u32 minorversion; u32 minorversion;
u32 status; u32 status;
const stateid_t *current_stateid; stateid_t current_stateid;
const stateid_t *save_stateid; stateid_t save_stateid;
/* to indicate current and saved state id presents */
u32 sid_flags;
}; };
static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs) static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs)