Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1851222pxb; Mon, 8 Mar 2021 07:53:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhtlH1WeO4lX5HdCVrsXgk0X4Q6GUqIVIdUe0GT0iALUwEP8z0FSI/sAWkzQteRngAL+nF X-Received: by 2002:aa7:dbd3:: with SMTP id v19mr20279467edt.314.1615218784220; Mon, 08 Mar 2021 07:53:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615218784; cv=none; d=google.com; s=arc-20160816; b=bDs/BGuePGJ8n6gnAtGLWtoDs9xEmOKSJvP9pTrKL7L4TpdO3HOpluI+hQ6NVY2YcR diqHXNRs2AywX6T14X15V2PTNIWUfYz64UuNIuQFx7nBD7gdtck3cdwuzSjiTMwGoGrZ oLbNwU5DFrvqQwWO/dcsuu9Q+hrN8MnyQyczZfKdgwlty+a/pYjvg9OokQFlSTkJcVod VUPL1THQeMkm9OY8rN6sGZ1hE4Nbrhk9/h9tUE4p6mUpSWhiMjry5NKpMkqaftRsXAjB iOuCfAcLrMhOZVm6U0V333VNRoE4FaytbXvab2I4TeYWG/gea8n5iOQzmp1tL8z+IIjo jV/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:from:user-agent:content-disposition:mime-version :message-id:subject:cc:to:date:dkim-signature:dkim-filter; bh=vkDTc1A+vYcibLi+ve/DNdx3yo4Si4tNWWU7QXiUcUA=; b=wEZ2oDa9bS3HXRVcBcTvk7vHpBWfYjQlmzNzSrmwdDwybN5jfI7uKxJxCQtd1wQCLO 7/ruH/4upUct8Ku0v98aCeo8G0V4PIy4yDCHKhNLDgdneG/1ejkevY/MBNTFxJh2UuQS 3nhlm46UK1vC67oBcv2XWkgc5+CH4I1xjBJJBdt0/wkjqT3TJUUXK+k3gziDWUExTet/ MpwUdvdWD2HAGuNrXWY9STFJBZL6nRWvXrUPAKF72pTmP4P/Ar8zMmkk/FuUps3PY3G3 cKfFVBUEdIm8Uda1BDwrLLMfjZii2rSCdyULhqRht27NATHXjLD6ma4/EeC0pBa7BQ0t O5xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fieldses.org header.s=default header.b=nELbCA8I; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t1si7036895eje.316.2021.03.08.07.52.30; Mon, 08 Mar 2021 07:53:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@fieldses.org header.s=default header.b=nELbCA8I; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230198AbhCHPv6 (ORCPT + 99 others); Mon, 8 Mar 2021 10:51:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbhCHPv5 (ORCPT ); Mon, 8 Mar 2021 10:51:57 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AEE8C06174A for ; Mon, 8 Mar 2021 07:51:57 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 27E9723D8; Mon, 8 Mar 2021 10:51:51 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 27E9723D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fieldses.org; s=default; t=1615218711; bh=vkDTc1A+vYcibLi+ve/DNdx3yo4Si4tNWWU7QXiUcUA=; h=Date:To:Cc:Subject:From:From; b=nELbCA8IK8FxcEm84PVk2vF1eob04PHYxm8warB31oUnzSiv7hMRqwN605HVyX06K 1/qh3kBwMpPlGnStXhgtgyvKBMpLJ0M7fqNI6oWdoBKgpZXYp1tLAPHx7glRtzG3Z4 DAfc5k5Ytf4QqEWx3vxhgbOn5s7MaoXNJ5mDC1NA= Date: Mon, 8 Mar 2021 10:51:51 -0500 To: Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] Revert "nfsd4: remove check_conflicting_opens warning" Message-ID: <20210308155151.GC7284@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) From: bfields@fieldses.org (J. Bruce Fields) Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" This reverts commit 50747dd5e47b "nfsd4: remove check_conflicting_opens warning", as a prerequisite for reverting 94415b06eb8a, which has a serious bug. Cc: stable@vger.kernel.org Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 4f6d7658da8a..408e2c4db926 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4952,6 +4952,7 @@ static int nfsd4_check_conflicting_opens(struct nfs4_client *clp, writes--; if (fp->fi_fds[O_RDWR]) writes--; + WARN_ON_ONCE(writes < 0); if (writes > 0) return -EAGAIN; spin_lock(&fp->fi_lock); -- 2.29.2