nfsd4; fix session reference count leak

Note the session has to be put() here regardless of what happens to the
client.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 117670864af00621c0b3b993be9123aec61bdd9d..5a69ee69b44f1e81ecea80da0435647eaaad6465 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -714,7 +714,6 @@ release_session_client(struct nfsd4_session *session)
        } else
                renew_client_locked(clp);
        spin_unlock(&client_lock);
-       nfsd4_put_session(session);
 }
 
 /* must be called under the client_lock */

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index ac17a70802399b9a9766ad8f593a21266d60a7a1..835924f5ca540557ac46eb909be7103c033b33d6 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3325,6 +3325,7 @@ nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compo
                }
                /* Renew the clientid on success and on replay */
                release_session_client(cs->session);
+               nfsd4_put_session(cs->session);
        }
        return 1;
 }