p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nfsd: simplify stateid allocation and file handling 

Don't allow stateids to clear the open file pointer until they are
being destroyed. In a later patches we'll want to rely on the fact that
we have a valid file pointer when dealing with the stateid and this
will save us from having to do a lot of NULL pointer checks before
doing so.

Also, move to allocating stateids with kzalloc and get rid of the
explicit zeroing of fields.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Trond Myklebust 2014-07-25 07:34:19 -04:00 committed by J. Bruce Fields
parent f9c00c3ab4
commit f83388341b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/nfsd/nfs4state.c
View File

@ -470,7 +470,7 @@ kmem_cache *slab)
struct nfs4_stid *stid; struct nfs4_stid *stid;
int new_id; int new_id;
stid = kmem_cache_alloc(slab, GFP_KERNEL); stid = kmem_cache_zalloc(slab, GFP_KERNEL);
if (!stid) if (!stid)
return NULL; return NULL;
@ -478,11 +478,9 @@ kmem_cache *slab)
if (new_id < 0) if (new_id < 0)
goto out_free; goto out_free;
stid->sc_client = cl; stid->sc_client = cl;
stid->sc_type = 0;
stid->sc_stateid.si_opaque.so_id = new_id; stid->sc_stateid.si_opaque.so_id = new_id;
stid->sc_stateid.si_opaque.so_clid = cl->cl_clientid; stid->sc_stateid.si_opaque.so_clid = cl->cl_clientid;
/* Will be incremented before return to client: */ /* Will be incremented before return to client: */
stid->sc_stateid.si_generation = 0;
atomic_set(&stid->sc_count, 1); atomic_set(&stid->sc_count, 1);
/* /*
@ -603,10 +601,8 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv
INIT_LIST_HEAD(&dp->dl_perfile); INIT_LIST_HEAD(&dp->dl_perfile);
INIT_LIST_HEAD(&dp->dl_perclnt); INIT_LIST_HEAD(&dp->dl_perclnt);
INIT_LIST_HEAD(&dp->dl_recall_lru); INIT_LIST_HEAD(&dp->dl_recall_lru);
dp->dl_file = NULL;
dp->dl_type = NFS4_OPEN_DELEGATE_READ; dp->dl_type = NFS4_OPEN_DELEGATE_READ;
fh_copy_shallow(&dp->dl_fh, &current_fh->fh_handle); fh_copy_shallow(&dp->dl_fh, &current_fh->fh_handle);
dp->dl_time = 0;
INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall); INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall);
return dp; return dp;
} }
@ -627,6 +623,8 @@ void
nfs4_put_delegation(struct nfs4_delegation *dp) nfs4_put_delegation(struct nfs4_delegation *dp)
{ {
if (atomic_dec_and_test(&dp->dl_stid.sc_count)) { if (atomic_dec_and_test(&dp->dl_stid.sc_count)) {
if (dp->dl_file)
put_nfs4_file(dp->dl_file);
remove_stid(&dp->dl_stid); remove_stid(&dp->dl_stid);
nfs4_free_stid(deleg_slab, &dp->dl_stid); nfs4_free_stid(deleg_slab, &dp->dl_stid);
num_delegations--; num_delegations--;
@ -678,13 +676,9 @@ unhash_delegation(struct nfs4_delegation *dp)
list_del_init(&dp->dl_recall_lru); list_del_init(&dp->dl_recall_lru);
list_del_init(&dp->dl_perfile); list_del_init(&dp->dl_perfile);
spin_unlock(&fp->fi_lock); spin_unlock(&fp->fi_lock);
if (fp) {
nfs4_put_deleg_lease(fp);
dp->dl_file = NULL;
}
spin_unlock(&state_lock);
if (fp) if (fp)
put_nfs4_file(fp); nfs4_put_deleg_lease(fp);
spin_unlock(&state_lock);
} }
static void destroy_revoked_delegation(struct nfs4_delegation *dp) static void destroy_revoked_delegation(struct nfs4_delegation *dp)
@ -892,12 +886,12 @@ static void unhash_generic_stateid(struct nfs4_ol_stateid *stp)
static void close_generic_stateid(struct nfs4_ol_stateid *stp) static void close_generic_stateid(struct nfs4_ol_stateid *stp)
{ {
release_all_access(stp); release_all_access(stp);
put_nfs4_file(stp->st_file);
stp->st_file = NULL;
} }
static void free_generic_stateid(struct nfs4_ol_stateid *stp) static void free_generic_stateid(struct nfs4_ol_stateid *stp)
{ {
if (stp->st_file)
put_nfs4_file(stp->st_file);
remove_stid(&stp->st_stid); remove_stid(&stp->st_stid);
nfs4_free_stid(stateid_slab, &stp->st_stid); nfs4_free_stid(stateid_slab, &stp->st_stid);
} }
@ -4469,6 +4463,10 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s)
if (list_empty(&oo->oo_owner.so_stateids)) if (list_empty(&oo->oo_owner.so_stateids))
release_openowner(oo); release_openowner(oo);
} else { } else {
if (s->st_file) {
put_nfs4_file(s->st_file);
s->st_file = NULL;
}
oo->oo_last_closed_stid = s; oo->oo_last_closed_stid = s;
/* /*
* In the 4.0 case we need to keep the owners around a * In the 4.0 case we need to keep the owners around a