From patchwork Thu Mar 17 12:16:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kinsbursky X-Patchwork-Id: 641351 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 p2HCHTDi024618 for ; Thu, 17 Mar 2011 12:17:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754255Ab1CQMRP (ORCPT ); Thu, 17 Mar 2011 08:17:15 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:43277 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753846Ab1CQMRN (ORCPT ); Thu, 17 Mar 2011 08:17:13 -0400 Received: from localhost6.localdomain6 ([10.30.20.35]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id p2HCGrM3022330; Thu, 17 Mar 2011 15:16:54 +0300 (MSK) Subject: [PATCH] RPC: killing RPC tasks races fixed To: Trond.Myklebust@netapp.com From: Stanislav Kinsbursky Cc: linux-nfs@vger.kernel.org, xemul@parallels.com, neilb@suse.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bfields@fieldses.org, davem@davemloft.net, skinsbursky@openvz.org Date: Thu, 17 Mar 2011 15:16:55 +0300 Message-ID: <20110317121638.15035.39410.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Mar 2011 12:17:29 +0000 (UTC) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 57d344c..24039fe 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -436,7 +436,9 @@ void rpc_killall_tasks(struct rpc_clnt *clnt) if (!(rovr->tk_flags & RPC_TASK_KILLED)) { rovr->tk_flags |= RPC_TASK_KILLED; rpc_exit(rovr, -EIO); - rpc_wake_up_queued_task(rovr->tk_waitqueue, rovr); + if (rovr->tk_waitqueue) + rpc_wake_up_queued_task(rovr->tk_waitqueue, + rovr); } } spin_unlock(&clnt->cl_lock);