From patchwork Tue Oct 16 16:30:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 1601561 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0C8B5DFFED for ; Tue, 16 Oct 2012 16:31:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754974Ab2JPQa7 (ORCPT ); Tue, 16 Oct 2012 12:30:59 -0400 Received: from mx2.netapp.com ([216.240.18.37]:15883 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754869Ab2JPQa6 (ORCPT ); Tue, 16 Oct 2012 12:30:58 -0400 X-IronPort-AV: E=Sophos;i="4.80,593,1344236400"; d="scan'208";a="701307838" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 16 Oct 2012 09:30:58 -0700 Received: from francist-pc.hq.netapp.com (francist-pc.hq.netapp.com [10.55.76.177] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id q9GGUnZJ016423; Tue, 16 Oct 2012 09:30:57 -0700 (PDT) From: Weston Andros Adamson To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 04/25] SUNRPC: remove BUG_ON() from call_transmit() Date: Tue, 16 Oct 2012 12:30:22 -0400 Message-Id: <1350405043-39316-4-git-send-email-dros@netapp.com> X-Mailer: git-send-email 1.7.9.6 (Apple Git-31.1) In-Reply-To: <1350405043-39316-1-git-send-email-dros@netapp.com> References: <1350405043-39316-1-git-send-email-dros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Replace BUG_ON() with WARN_ON_ONCE() and if the error condition is true attempt to gracefully recover by calling rpc_exit(). Signed-off-by: Weston Andros Adamson --- net/sunrpc/clnt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index fe8a133..76d1730 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1661,7 +1661,11 @@ call_transmit(struct rpc_task *task) task->tk_action = call_transmit_status; /* Encode here so that rpcsec_gss can use correct sequence number. */ if (rpc_task_need_encode(task)) { - BUG_ON(task->tk_rqstp->rq_bytes_sent != 0); + WARN_ON(task->tk_rqstp->rq_bytes_sent != 0); + if (task->tk_rqstp->rq_bytes_sent != 0) { + rpc_exit(task, -EINVAL); + return; + } rpc_xdr_encode(task); /* Did the encode result in an error condition? */ if (task->tk_status != 0) {