From 6d4dde31c0f0f98b3f0c3569fa6d833a8fb9c6c7 Mon Sep 17 00:00:00 2001
From: fanchaoting <fanchaoting@cn.fujitsu.com>
Date: Mon, 1 Apr 2013 21:07:22 +0800
Subject: [PATCH] --- yaml --- r: 372180 b: refs/heads/master c:
 b022032e195ffca83d7002d6b84297d796ed443b h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/nfsd/nfs4proc.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index da4f2f1770e1..679437c0874a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89876f8c0dbcc2947b13b9e22cf28c5308cee3c1
+refs/heads/master: b022032e195ffca83d7002d6b84297d796ed443b
diff --git a/trunk/fs/nfsd/nfs4proc.c b/trunk/fs/nfsd/nfs4proc.c
index 42c498ce9f0e..a9b707b23858 100644
--- a/trunk/fs/nfsd/nfs4proc.c
+++ b/trunk/fs/nfsd/nfs4proc.c
@@ -953,14 +953,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;