From patchwork Tue Mar 22 14:52:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lojkin X-Patchwork-Id: 652891 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 p2MEwAbH009691 for ; Tue, 22 Mar 2011 14:58:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754004Ab1CVO6H (ORCPT ); Tue, 22 Mar 2011 10:58:07 -0400 Received: from fallback2.mail.ru ([94.100.176.87]:34371 "EHLO fallback2.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753544Ab1CVO6H (ORCPT ); Tue, 22 Mar 2011 10:58:07 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 22 Mar 2011 14:58:11 +0000 (UTC) X-Greylist: delayed 303 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Mar 2011 10:58:07 EDT Received: from f70.mail.ru (f70.mail.ru [217.69.128.219]) by fallback2.mail.ru (mPOP.Fallback_MX) with ESMTP id AEF824247BF0 for ; Tue, 22 Mar 2011 17:53:01 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail; h=Message-Id:Content-Transfer-Encoding:Content-Type:Reply-To:Date:Mime-Version:Subject:Cc:To:From; bh=6UODgV3RqVng02zingF6Ww8wo0PD4e1tuAnSKuAd79w=; b=V2+DiAg+M6jp9zgmAhoxQRw9ALZ9Ra/QdHSxOyPliZ7qAFXYAIFLSDY708u60t75qpWUMKKF2yTNDw7giDtjCGqg0R2R2pjjlEW4caeA00NfekmH6363p4HK3EVroDhi; Received: from mail by f70.mail.ru with local id 1Q22wg-00080R-00; Tue, 22 Mar 2011 17:52:30 +0300 Received: from [91.79.186.251] by e.mail.ru with HTTP; Tue, 22 Mar 2011 17:52:27 +0300 From: Peter Lojkin To: linux-nfs@vger.kernel.org Cc: Stanislav Kinsbursky Subject: =?utf-8?Q?Re=3A_[PATCH_v2]_RPC=3A_killing_RPC_tasks_races_fixed?= Mime-Version: 1.0 X-Mailer: mPOP Web-Mail 2.19 X-Originating-IP: unknown via proxy [91.79.186.251] Date: Tue, 22 Mar 2011 17:52:27 +0300 Reply-To: Peter Lojkin Message-Id: X-Spam: Not detected X-Mras: Ok Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org --- a/net/sunrpc/sched.c 2011-03-22 16:55:36.802000287 +0300 +++ b/net/sunrpc/sched.c 2011-03-22 17:01:13.858000242 +0300 @@ -939,7 +939,8 @@ if (!(rovr->tk_flags & RPC_TASK_KILLED)) { rovr->tk_flags |= RPC_TASK_KILLED; rpc_exit(rovr, -EIO); - rpc_wake_up_task(rovr); + if (RPC_IS_QUEUED(rovr)) + rpc_wake_up_task(rovr); } } spin_unlock(&clnt->cl_lock);