From patchwork Wed Nov 17 03:36:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 334131 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAHLGHN0012527 for ; Wed, 17 Nov 2010 21:17:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932433Ab0KQVQR (ORCPT ); Wed, 17 Nov 2010 16:16:17 -0500 Received: from mx2.netapp.com ([216.240.18.37]:48021 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756456Ab0KQVQP (ORCPT ); Wed, 17 Nov 2010 16:16:15 -0500 X-IronPort-AV: E=Sophos;i="4.59,213,1288594800"; d="scan'208";a="483635824" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 17 Nov 2010 13:15:57 -0800 Received: from localhost.localdomain (dros.local [10.58.56.101] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id oAHLFth6003786; Wed, 17 Nov 2010 13:15:57 -0800 (PST) From: andros@netapp.com To: benny@panasas.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 2/3] SQUASHME: pnfs-submit: fix highest backchannel slot used Date: Tue, 16 Nov 2010 22:36:29 -0500 Message-Id: <1289964990-4480-3-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1289964990-4480-2-git-send-email-andros@netapp.com> References: <1289964990-4480-1-git-send-email-andros@netapp.com> <1289964990-4480-2-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 17 Nov 2010 21:17:16 +0000 (UTC) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index a77877c..92719f1 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -791,7 +791,8 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r *hdr_res.status = status; *hdr_res.nops = htonl(nops); - nfs4_callback_free_slot(cps.session); + if (cps.session) + nfs4_callback_free_slot(cps.session); /* matched by cb_sequence find_client_with_session */ put_session_client(cps.session); dprintk("%s: done, status = %u\n", __func__, ntohl(status));