evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: Make init_open_stateid() a bit more whole

Browse source 
commit 8c7245abda877d4689b3371db8ae2a4400d7d9ce upstream.

Move the state selection logic inside from the caller,
always making it return correct stp to use.

Signed-off-by: J . Bruce Fields <bfields@fieldses.org>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2016-06-14 23:28:06 -04:00 • committed by Greg Kroah-Hartman
parent 68e6cd9a05
commit d7f5f10f51
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
fs/nfsd/nfs4state.c
View file

@ -3420,13 +3420,14 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open,
} }
static struct nfs4_ol_stateid * static struct nfs4_ol_stateid *
init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, init_open_stateid(struct nfs4_file *fp, struct nfsd4_open *open)
struct nfsd4_open *open)
{ {
struct nfs4_openowner *oo = open->op_openowner; struct nfs4_openowner *oo = open->op_openowner;
struct nfs4_ol_stateid *retstp = NULL; struct nfs4_ol_stateid *retstp = NULL;
struct nfs4_ol_stateid *stp;
stp = open->op_stp;
/* We are moving these outside of the spinlocks to avoid the warnings */ /* We are moving these outside of the spinlocks to avoid the warnings */
mutex_init(&stp->st_mutex); mutex_init(&stp->st_mutex);
mutex_lock(&stp->st_mutex); mutex_lock(&stp->st_mutex);
@ -3437,6 +3438,8 @@ init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp,
retstp = nfsd4_find_existing_open(fp, open); retstp = nfsd4_find_existing_open(fp, open);
if (retstp) if (retstp)
goto out_unlock; goto out_unlock;
open->op_stp = NULL;
atomic_inc(&stp->st_stid.sc_count); atomic_inc(&stp->st_stid.sc_count);
stp->st_stid.sc_type = NFS4_OPEN_STID; stp->st_stid.sc_type = NFS4_OPEN_STID;
INIT_LIST_HEAD(&stp->st_locks); INIT_LIST_HEAD(&stp->st_locks);
@ -3454,10 +3457,11 @@ out_unlock:
spin_unlock(&oo->oo_owner.so_client->cl_lock); spin_unlock(&oo->oo_owner.so_client->cl_lock);
if (retstp) { if (retstp) {
mutex_lock(&retstp->st_mutex); mutex_lock(&retstp->st_mutex);
/* Not that we need to, just for neatness */ /* To keep mutex tracking happy */
mutex_unlock(&stp->st_mutex); mutex_unlock(&stp->st_mutex);
stp = retstp;
} }
return retstp; return stp;
} }
/* /*
@ -4260,7 +4264,6 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
struct nfs4_client *cl = open->op_openowner->oo_owner.so_client; struct nfs4_client *cl = open->op_openowner->oo_owner.so_client;
struct nfs4_file *fp = NULL; struct nfs4_file *fp = NULL;
struct nfs4_ol_stateid *stp = NULL; struct nfs4_ol_stateid *stp = NULL;
struct nfs4_ol_stateid *swapstp = NULL;
struct nfs4_delegation *dp = NULL; struct nfs4_delegation *dp = NULL;
__be32 status; __be32 status;
@ -4297,16 +4300,10 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
goto out; goto out;
} }
} else { } else {
stp = open->op_stp; /* stp is returned locked. */
open->op_stp = NULL; stp = init_open_stateid(fp, open);
/* /* See if we lost the race to some other thread */
* init_open_stateid() either returns a locked stateid if (stp->st_access_bmap != 0) {
* it found, or initializes and locks the new one we passed in
*/
swapstp = init_open_stateid(stp, fp, open);
if (swapstp) {
nfs4_put_stid(&stp->st_stid);
stp = swapstp;
status = nfs4_upgrade_open(rqstp, fp, current_fh, status = nfs4_upgrade_open(rqstp, fp, current_fh,
stp, open); stp, open);
if (status) { if (status) {