From patchwork Tue Oct 16 16:30:26 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: 1601601 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 86302DFFED for ; Tue, 16 Oct 2012 16:31:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754869Ab2JPQbE (ORCPT ); Tue, 16 Oct 2012 12:31:04 -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 S1755047Ab2JPQbD (ORCPT ); Tue, 16 Oct 2012 12:31:03 -0400 X-IronPort-AV: E=Sophos;i="4.80,593,1344236400"; d="scan'208";a="701307886" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 16 Oct 2012 09:31:03 -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 q9GGUnZN016423; Tue, 16 Oct 2012 09:31:02 -0700 (PDT) From: Weston Andros Adamson To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 08/25] SUNRPC: remove BUG_ON() from rpc_sleep_on*() Date: Tue, 16 Oct 2012 12:30:26 -0400 Message-Id: <1350405043-39316-8-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 clean up by calling rpc_exit(). Signed-off-by: Weston Andros Adamson --- net/sunrpc/sched.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 6357fcb..ec9513d 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -343,7 +343,11 @@ void rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task, rpc_action action) { /* We shouldn't ever put an inactive task to sleep */ - BUG_ON(!RPC_IS_ACTIVATED(task)); + WARN_ON_ONCE(!RPC_IS_ACTIVATED(task)); + if (!RPC_IS_ACTIVATED(task)) { + rpc_exit(task, -EINVAL); + return; + } /* * Protect the queue operations. @@ -358,7 +362,11 @@ void rpc_sleep_on_priority(struct rpc_wait_queue *q, struct rpc_task *task, rpc_action action, int priority) { /* We shouldn't ever put an inactive task to sleep */ - BUG_ON(!RPC_IS_ACTIVATED(task)); + WARN_ON_ONCE(!RPC_IS_ACTIVATED(task)); + if (!RPC_IS_ACTIVATED(task)) { + rpc_exit(task, -EINVAL); + return; + } /* * Protect the queue operations.