From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: [PATCH 1/2] nfsd4.1: fix session memory use calculation Date: Tue, 27 Oct 2009 19:07:41 -0400 Message-ID: <1256684862-14390-2-git-send-email-bfields@citi.umich.edu> References: <1256684862-14390-1-git-send-email-bfields@citi.umich.edu> Cc: pnfs@linux-nfs.org, Andy Adamson , "J. Bruce Fields" To: linux-fsdevel@vger.kernel.org Return-path: Received: from fieldses.org ([174.143.236.118]:54762 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754777AbZJ0XGU (ORCPT ); Tue, 27 Oct 2009 19:06:20 -0400 In-Reply-To: <1256684862-14390-1-git-send-email-bfields@citi.umich.edu> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Unbalanced calculations on creation and destruction of sessions could cause our estimate of cache memory used to become negative, sometimes resulting in spurious SERVERFAULT returns to client CREATE_SESSION requests. Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fcb9817..c171371 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -629,10 +629,13 @@ void free_session(struct kref *kref) { struct nfsd4_session *ses; + int mem; ses = container_of(kref, struct nfsd4_session, se_ref); spin_lock(&nfsd_drc_lock); - nfsd_drc_mem_used -= ses->se_fchannel.maxreqs * NFSD_SLOT_CACHE_SIZE; + mem = ses->se_fchannel.maxreqs + * (ses->se_fchannel.maxresp_cached - NFSD_MIN_HDR_SEQ_SZ); + nfsd_drc_mem_used -= mem; spin_unlock(&nfsd_drc_lock); free_session_slots(ses); kfree(ses); -- 1.6.3.3