Skip to contentSkip to conversation

PATCH]nfsd: don't run get_file if nfs4_preprocess_stateid_op return error

PATCH fanchaoting 2 participants 2 messages Apr 1, 2013 – Apr 3, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

we should return error status directly when
nfs4_preprocess_stateid_op return error.

---
 fs/nfsd/nfs4proc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
fs/nfsd/nfs4proc.c +4 -4
index ae73175..8288b08 100644
@@ -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;
Signature · 1 line
1.7.1
#1 lore raw

Thanks, applying, and adding a cc: for stable.--b.

Quoted 35 lines · fanchaoting

we should return error status directly when
nfs4_preprocess_stateid_op return error.

---
 fs/nfsd/nfs4proc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
fs/nfsd/nfs4proc.c +4 -4
index ae73175..8288b08 100644
@@ -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;
Signature · 1 line
1.7.1