From patchwork Thu Dec 1 22:19:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9457175 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 C01DE60756 for ; Thu, 1 Dec 2016 22:19:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B28BE28540 for ; Thu, 1 Dec 2016 22:19:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A763328541; Thu, 1 Dec 2016 22:19: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 5BFCD28542 for ; Thu, 1 Dec 2016 22:19:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759771AbcLAWTi (ORCPT ); Thu, 1 Dec 2016 17:19:38 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:35071 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752472AbcLAWTg (ORCPT ); Thu, 1 Dec 2016 17:19:36 -0500 Received: by mail-io0-f194.google.com with SMTP id h133so4680855ioe.2 for ; Thu, 01 Dec 2016 14:19:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=k3N1Ke1mp1p2Om4BdtjiE56Vv2OujeBtZ4Hk1GOyr5M=; b=NLWr9aViceRl5acXSvLvYvyOaAuCFVMu8Q4DUVtK9x8yLfa75x2sPkRAZ7PiUbmCVn SI/kdbqoyyhrRnw4AJXbNSS53IyDzqy/kTFIduu8lHzzFqJno9ciG7zn0K7dBY5FVgy3 6xdpzt3kjdIsoPRIYXdv2QtxwjsBrf8nf/b++ABvT13pWbG/dJ++Q1ZGFu2ZBnNzWyCD IVd7C5QiO3A3GahE4AMbh3vhL+kZ6dIc/SCJDCsYMjMDsBJQ7R8J/BkQFAulOccheKB8 P4g/kGz45trXY3bJXBsSfgTnEBrlF7QK96A7wYn1twOdw7NXj8dqlwEwMUDTtS4rIKKj bvHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=k3N1Ke1mp1p2Om4BdtjiE56Vv2OujeBtZ4Hk1GOyr5M=; b=BD3uMk4vRe/5HlH33dn9w6/c9vp/Tn+l3j6AvfRl3zzOsn9AedxTtKFwN/OkFNiHSZ JdXU9Et1pmVTWRv7kgPXUTaTTnxl4A/vl6SUPIq9ifKoPm2am/nYwtfBj0DyKASZDhM9 +EvCFx8wNmfFP1UO6pnaG6CSXfYHjkqeEir0rRblZdCsUpjX8naI36fxL2cZAP7BCd5c 82oZErcWRK1ybOy0LBSyGNXZKG3H9+mMc+hsAh5D4Q0iLNiLIan934iKsHgZPoVC8FF+ bExRYM2tQ543fl+YTxvlDGpJBTzbbD4IICllAJVa/6hs436AonGRYkYexTlno7olv4o2 bagw== X-Gm-Message-State: AKaTC00mSBWgDlYlzWxGJTnfkVwUJVv+3pS33JqKnwYlAA6qT0lsDy40vZXVr7VaUTVXxg== X-Received: by 10.107.19.104 with SMTP id b101mr33249120ioj.150.1480630776068; Thu, 01 Dec 2016 14:19:36 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id t20sm6532ita.7.2016.12.01.14.19.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 14:19:35 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 11/26] pNFS: Remove spurious wake up in pnfs_layout_remove_lseg() Date: Thu, 1 Dec 2016 17:19:07 -0500 Message-Id: <20161201221922.15657-12-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161201221922.15657-11-trond.myklebust@primarydata.com> References: <20161201221922.15657-1-trond.myklebust@primarydata.com> <20161201221922.15657-2-trond.myklebust@primarydata.com> <20161201221922.15657-3-trond.myklebust@primarydata.com> <20161201221922.15657-4-trond.myklebust@primarydata.com> <20161201221922.15657-5-trond.myklebust@primarydata.com> <20161201221922.15657-6-trond.myklebust@primarydata.com> <20161201221922.15657-7-trond.myklebust@primarydata.com> <20161201221922.15657-8-trond.myklebust@primarydata.com> <20161201221922.15657-9-trond.myklebust@primarydata.com> <20161201221922.15657-10-trond.myklebust@primarydata.com> <20161201221922.15657-11-trond.myklebust@primarydata.com> 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 There is no change to the value of NFS_LAYOUT_RETURN, so we should not be waking up the RPC call. Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 471018f27c8d..a64d1e40dba9 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -420,8 +420,6 @@ static void pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo, struct pnfs_layout_segment *lseg) { - struct inode *inode = lo->plh_inode; - WARN_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags)); list_del_init(&lseg->pls_list); /* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */ @@ -433,7 +431,6 @@ pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo, set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags); clear_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags); } - rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq); } static bool