summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorycnian@gmail.com <ycnian@gmail.com>2013-03-11 08:46:14 +0800
committerJ. Bruce Fields <bfields@redhat.com>2013-04-03 11:48:34 -0400
commit491402a7876e91aa491c33f70ed4e86e59f06c8b (patch)
treef8357ff807c5a480aa677f6a0cfaced45d5fa765
parent9c6bdbb8dd58c8de8f36e1deb6b768918c85c249 (diff)
downloadlinux-491402a7876e91aa491c33f70ed4e86e59f06c8b.tar.bz2
nfsd: fix bug on nfs4 stateid deallocation
NFS4_OO_PURGE_CLOSE is not handled properly. To avoid memory leak, nfs4 stateid which is pointed by oo_last_closed_stid is freed in nfsd4_close(), but NFS4_OO_PURGE_CLOSE isn't cleared meanwhile. So the stateid released in THIS close procedure may be freed immediately in the coming encoding function. Sorry that Signed-off-by was forgotten in last version. Signed-off-by: Yanchuan Nian <ycnian@gmail.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4state.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index baf314a950b8..aac878ecabc4 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3823,6 +3823,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
nfsd4_close_open_stateid(stp);
release_last_closed_stateid(oo);
+ oo->oo_flags &= ~NFS4_OO_PURGE_CLOSE;
oo->oo_last_closed_stid = stp;
if (list_empty(&oo->oo_owner.so_stateids)) {