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

nfsd4: simplify distinguishing lock & open stateid's

Browse Source 
The trick free_stateid is using is a little cheesy, and we'll have more
uses for this field later.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields
2011-08-31 15:25:46 -04:00
parent c2d8eb7ac6
commit 5fa0bbb4ee
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfsd/nfs4state.c
View File

@@ -2285,6 +2285,7 @@ init_stateid(struct nfs4_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *
list_add(&stp->st_hash, &stateid_hashtbl[hashval]); list_add(&stp->st_hash, &stateid_hashtbl[hashval]);
list_add(&stp->st_perstateowner, &sop->so_stateids); list_add(&stp->st_perstateowner, &sop->so_stateids);
list_add(&stp->st_perfile, &fp->fi_stateids); list_add(&stp->st_perfile, &fp->fi_stateids);
stp->st_type = NFS4_OPEN_STID;
stp->st_stateowner = sop; stp->st_stateowner = sop;
get_nfs4_file(fp); get_nfs4_file(fp);
stp->st_file = fp; stp->st_file = fp;
@@ -3201,11 +3202,6 @@ static int is_delegation_stateid(stateid_t *stateid)
return stateid->si_fileid == 0; return stateid->si_fileid == 0;
} }
static int is_open_stateid(struct nfs4_stateid *stateid)
{
return stateid->st_openstp == NULL;
}
__be32 nfs4_validate_stateid(stateid_t *stateid, bool has_session) __be32 nfs4_validate_stateid(stateid_t *stateid, bool has_session)
{ {
struct nfs4_stateid *stp = NULL; struct nfs4_stateid *stp = NULL;
@@ -3369,7 +3365,7 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
} }
} }
if (is_open_stateid(stp)) { if (stp->st_type == NFS4_OPEN_STID) {
ret = nfserr_locks_held; ret = nfserr_locks_held;
goto out; goto out;
} else { } else {
@@ -3928,6 +3924,7 @@ alloc_init_lock_stateid(struct nfs4_stateowner *sop, struct nfs4_file *fp, struc
list_add(&stp->st_perfile, &fp->fi_stateids); list_add(&stp->st_perfile, &fp->fi_stateids);
list_add(&stp->st_perstateowner, &sop->so_stateids); list_add(&stp->st_perstateowner, &sop->so_stateids);
stp->st_stateowner = sop; stp->st_stateowner = sop;
stp->st_type = NFS4_LOCK_STID;
get_nfs4_file(fp); get_nfs4_file(fp);
stp->st_file = fp; stp->st_file = fp;
stp->st_stateid.si_boot = boot_time; stp->st_stateid.si_boot = boot_time;

3
fs/nfsd/state.h
View File

@@ -425,6 +425,9 @@ static inline struct file *find_any_file(struct nfs4_file *f)
*/ */
struct nfs4_stateid { struct nfs4_stateid {
#define NFS4_OPEN_STID 1
#define NFS4_LOCK_STID 2
char st_type;
struct list_head st_hash; struct list_head st_hash;
struct list_head st_perfile; struct list_head st_perfile;
struct list_head st_perstateowner; struct list_head st_perstateowner;