From patchwork Mon Apr 22 16:34:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 10911229 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A69EE14DB for ; Mon, 22 Apr 2019 16:34:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F62520072 for ; Mon, 22 Apr 2019 16:34:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80C7628553; Mon, 22 Apr 2019 16:34:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 74BC620072 for ; Mon, 22 Apr 2019 16:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727406AbfDVQe1 (ORCPT ); Mon, 22 Apr 2019 12:34:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:48688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727347AbfDVQe1 (ORCPT ); Mon, 22 Apr 2019 12:34:27 -0400 Received: from tleilax.poochiereds.net (cpe-71-70-156-158.nc.res.rr.com [71.70.156.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 25DA3214AE; Mon, 22 Apr 2019 16:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555950866; bh=qfqcN4NzGxCRY4Fo7ufVvBOjSpFYIcx9CFljJ71JCec=; h=From:To:Cc:Subject:Date:From; b=ju3r6jW5CMSlcFECS8fWUpLvhF4SPh5egsmWuZiYc+80tQHEAWB6UlUo0X33zdIqO DEgNKhPCCfuZYk4Bq+L9fsqZUAxq1fQsDz6sUNp/1Oa3POHm35xeRZcbzysZ2h6VJu EK48c34XfgDXGNO9r3oCrXz2HK+59Zyuzlnnda84= From: Jeff Layton To: bfields@fieldses.org Cc: slawek1211@gmail.com, neilb@suse.com, linux-nfs@vger.kernel.org Subject: [PATCH v2 0/2] nfsd: ensure we wake file lock waiters before deleting blocked lock Date: Mon, 22 Apr 2019 12:34:22 -0400 Message-Id: <20190422163424.19402-1-jlayton@kernel.org> X-Mailer: git-send-email 2.20.1 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 This is a respin of the patch that I sent over the weekend. It's a bit more obvious to just call locks_delete_block from free_blocked_lock, and that allows us to remove that call from some other sites. Still though, I think we probably do want to wake blocked lock requests prior to sending a callback to ensure that they can make progress when the callback isn't getting a reply. The second patch does this. Jeff Layton (2): nfsd: wake waiters blocked on file_lock before deleting it nfsd: wake blocked file lock waiters before sending callback fs/nfsd/nfs4state.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)