| Message ID | 5159868A.8080105@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Thanks, applying, and adding a cc: for stable.--b. On Mon, Apr 01, 2013 at 09:07:22PM +0800, fanchaoting wrote: > we should return error status directly when > nfs4_preprocess_stateid_op return error. > > Signed-off-by: fanchaoting <fanchaoting@cn.fujitsu.com> > --- > fs/nfsd/nfs4proc.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c > index ae73175..8288b08 100644 > --- a/fs/nfsd/nfs4proc.c > +++ b/fs/nfsd/nfs4proc.c > @@ -931,14 +931,14 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, > nfs4_lock_state(); > status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), > cstate, stateid, WR_STATE, &filp); > - if (filp) > - get_file(filp); > - nfs4_unlock_state(); > - > if (status) { > + nfs4_unlock_state(); > dprintk("NFSD: nfsd4_write: couldn't process stateid!\n"); > return status; > } > + if (filp) > + get_file(filp); > + nfs4_unlock_state(); > > cnt = write->wr_buflen; > write->wr_how_written = write->wr_stable_how; > -- > 1.7.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index ae73175..8288b08 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -931,14 +931,14 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, nfs4_lock_state(); status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), cstate, stateid, WR_STATE, &filp); - if (filp) - get_file(filp); - nfs4_unlock_state(); - if (status) { + nfs4_unlock_state(); dprintk("NFSD: nfsd4_write: couldn't process stateid!\n"); return status; } + if (filp) + get_file(filp); + nfs4_unlock_state(); cnt = write->wr_buflen; write->wr_how_written = write->wr_stable_how;
we should return error status directly when nfs4_preprocess_stateid_op return error. Signed-off-by: fanchaoting <fanchaoting@cn.fujitsu.com> --- fs/nfsd/nfs4proc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)