From patchwork Wed Oct 11 18:01:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10000271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 43F4B60244 for ; Wed, 11 Oct 2017 18:01:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F8F728AFB for ; Wed, 11 Oct 2017 18:01:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 343DE28B00; Wed, 11 Oct 2017 18:01:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAD4B28AFB for ; Wed, 11 Oct 2017 18:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757821AbdJKSBi (ORCPT ); Wed, 11 Oct 2017 14:01:38 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:43301 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757764AbdJKSBi (ORCPT ); Wed, 11 Oct 2017 14:01:38 -0400 Received: by mail-it0-f65.google.com with SMTP id k70so11181230itk.0 for ; Wed, 11 Oct 2017 11:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KfMY8fdG/mUr9ZJ8UAd351bNsPnHXMkTep366NCygmc=; b=TazQFPaRiTUFqwXj06LcTY/NnZzi+uOT0XG0Ak3hvRZRrNaBzxFw/KuqgmtzwMmB2I uXj6qK+eXpPXTwzmAbk4Yd0olYQbvwEsgMjkw9+myZ4uBRimECvDTKJdmLzNyw7KUOqC JixhUrYC0bd2/U8d9u2E7x00U70dzd/8XRVa7UfeO5buPAe1UGDmzBUdlKhf8eGSah1+ azACvHIAQSGx1QmOP7x6uWS+UKwCZByLObNDk81x8wyzZ+pYO+XVPDQaZhr8vkrQeUrn gm1bKqS4FfSf9Egr/pRaInIUwjGLfW9M7MI8V580W3cTC/THgqcL5jPvfg7JgWZcrFG0 H9DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=KfMY8fdG/mUr9ZJ8UAd351bNsPnHXMkTep366NCygmc=; b=V6zjOdq4oukXq1vPPTDjdj6c+VEYiZpGSdBrm4cZtnf6olWC95VFXTyemUA+VtN6Uv vrmIskN3GgQ9jLl60O53j+oArRuvPrSbTGJh4EFhFc+UjsXbLjnhDX08RiaQFkXf2vEk iFYOByglT7y9kYj2eI12db8pGEweORi3kTxoiqsV0TDJU3YeDypA5gyq5JBcahTzU+SK qzs3ENlcGfeb+6zE9aCXl9W+zkc0BRxvIY4y7LSRxrBmzw1pKvQbU8CVXvhP5d7z86FG /1ThM8mp7Tg0fmk9BTfZ5HbalN5881j6ZrlKCQazvBfE8NXmUQdbDNidmumviPCnycdL NcEQ== X-Gm-Message-State: AMCzsaU9/+3eqS7LAu5j5gjHwaFaTQEfOatPtgqbiX9aQPr4NylClayI v152XRUf8xH6d17DnSxejA== X-Google-Smtp-Source: AOwi7QDIbk3MFLa7na9J0LIs3N2onQf3RjtaF9kZmVyseo6514JAEWEz19EOiPWmZRQLBgZJzZLF+A== X-Received: by 10.36.33.71 with SMTP id e68mr555415ita.111.1507744897305; Wed, 11 Oct 2017 11:01:37 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id m12sm6929701ita.10.2017.10.11.11.01.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2017 11:01:36 -0700 (PDT) From: Trond Myklebust To: Anna Schumaker Cc: Lorenzo Pieralisi , linux-nfs@vger.kernel.org Subject: [PATCH] SUNRPC: Remove redundant call to cancel_work_sync() in xprt_destroy() Date: Wed, 11 Oct 2017 14:01:34 -0400 Message-Id: <20171011180134.52476-1-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We know that the socket autoclose cannot be queued after we've set the XPRT_LOCKED bit, so the call to cancel_work_sync() is redundant. In addition, it is causing lockdep to complain about a false ABA lock dependency. Signed-off-by: Trond Myklebust --- net/sunrpc/xprt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index e741ec2b4d8e..5f12fe145f02 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1464,7 +1464,6 @@ static void xprt_destroy(struct rpc_xprt *xprt) rpc_destroy_wait_queue(&xprt->pending); rpc_destroy_wait_queue(&xprt->sending); rpc_destroy_wait_queue(&xprt->backlog); - cancel_work_sync(&xprt->task_cleanup); kfree(xprt->servername); /* * Tear down transport state and free the rpc_xprt