From abdca77a81ea87339ceddbda59acfb40fdda107a Mon Sep 17 00:00:00 2001
From: fanchaoting <tingchaofan@gmail.com>
Date: Thu, 11 Apr 2013 21:24:13 +0800
Subject: [PATCH] --- yaml --- r: 372199 b: refs/heads/master c:
 53584f66529d4c5940901e4ffe98ad7012dc6e0c h: refs/heads/master i:   372197:
 06f29665efd47d6ba58a01cd22ca2431dacc89ef   372195:
 96fbc8c82127670fd78918502c9a846fc9212fc1   372191:
 59ac23ae4ec682927582b733b17ef8b3b4ab414f v: v3

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

diff --git a/[refs] b/[refs]
index 3ebbb65496ab..ea92c974109b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bd64a5ba1719c2bb6cba4493dfd3e23a7653e54
+refs/heads/master: 53584f66529d4c5940901e4ffe98ad7012dc6e0c
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 3b84700d1bd7..a7954913b332 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -3919,8 +3919,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 			 * In the 4.0 case we need to keep the owners around a
 			 * little while to handle CLOSE replay.
 			 */
-			if (list_empty(&oo->oo_owner.so_stateids))
-				move_to_close_lru(oo, SVC_NET(rqstp));
+			move_to_close_lru(oo, SVC_NET(rqstp));
 		}
 	}
 out: