Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1418433pxb; Wed, 6 Apr 2022 18:23:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcJntGRPPAhYAbbL8jkQxXHttxCjlzJLC8Ox415xyCc+Yb5zaA+9aAn3GMhUC92ANxK2Fr X-Received: by 2002:a05:6402:3554:b0:419:402f:f632 with SMTP id f20-20020a056402355400b00419402ff632mr11418031edd.1.1649294591517; Wed, 06 Apr 2022 18:23:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649294591; cv=none; d=google.com; s=arc-20160816; b=Iy+Huh7dAPgDzNq2IO/WONsJC9+mGGr98zgDfolGsYr38kMpJKZaPmETcq/J7pcZK7 ogXWgHxiDJQgdN60LxF3dNHLjUI10mSYyQcqHojQZaIy2KLWZj+pZOQf45ZS+bN2LxOG JD1qvHAePvTVAlepvy8j0rZRz26lBLg1xDnkyh7BKn/OEC7YFec0BeLJ78ls6CbxvsRg Lhu6LyWgzRBSwm6WiBa6GBMOn684mR48DWaR0iAUJM1POS6NjrxCp53+9TzwL9nE9R3o 6jxEps7BTxMq6uvUs29QnNeRmzcz/AZTHV3CHe0PoFiurLJhfCiZ7AOVcPE88kwy6/YE 6bmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=0EQOOOdY4EGMVPmEDzzSC8tjUGihm8PKNfnZJ9IAmRs=; b=xTH9olma9ovCjfaF22c3j0c2iOYvbg0lBCGs8/WzSnbGlZM+wupVQqQyu6buwyCvMZ wQnowBPl1LzofUGpn93J2HB/KZ17MJNVIJ4WYdR9P5SxyeBSeM3QOMdHOQRmEl+hycQS lVe9GcsS1SAV1ZVWIuTzXiQtC+5y8KbcXgBP5JOyp/piUDT1sgq/YjXjXmBKRrt1taWS hFcVI1Bz7FLE3DfZFyjDk2UC6xfOEfSY3PpJuT3yJqknW5g6pi8c/KR86lp6s53zPF1y yStWRmDRfsRgb8XnKIW/9RI3FW4tyh4VnJlwbb6xVD05wAQNScZana6YKnRmLPcYP0b3 oW1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b=nIgYMfsF; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q13-20020a170906b28d00b006e82edbd3easi939360ejz.757.2022.04.06.18.22.47; Wed, 06 Apr 2022 18:23:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b=nIgYMfsF; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237219AbiDFWrs (ORCPT + 99 others); Wed, 6 Apr 2022 18:47:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237345AbiDFWrm (ORCPT ); Wed, 6 Apr 2022 18:47:42 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D0CC179422 for ; Wed, 6 Apr 2022 15:45:43 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 236KgkhR012570; Wed, 6 Apr 2022 22:45:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2021-07-09; bh=0EQOOOdY4EGMVPmEDzzSC8tjUGihm8PKNfnZJ9IAmRs=; b=nIgYMfsFet+K0m10mxseZld80jQmLB0gQMKNY4BzwY5rE48/TWBrnu68K9HU4PCd73me FoqMAzMMwf3syQyfXUG4Z1BLh0DJsgx1FDdS7BNNpnCdeahJLTDvzoelR0rQbOZ6YhbF RBrtbO4bCuADx875XHLlT2qNfB2DuXh0ldJxm7DfFgNR+nVQqzQ15th4IqT0tXQ0sQ80 Z9deWQW7Dsr1zBfzrdz733yxP+LzlAu9bHA7G3WauFxPgb0pvHxsIi0cKrzveCcbrl/G ZNXXeF8uiWOT3z/O9lSOSTVPb2vNSmr35dDRPgW9taF+8jh08f8J/HWD2cTyg69sOoGm SA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com with ESMTP id 3f6cwcj1k1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 Apr 2022 22:45:42 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 236MeY3m011594; Wed, 6 Apr 2022 22:45:41 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3f9803d5np-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 Apr 2022 22:45:41 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 236Mjcbc021908; Wed, 6 Apr 2022 22:45:41 GMT Received: from ca-common-hq.us.oracle.com (ca-common-hq.us.oracle.com [10.211.9.209]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3f9803d5mk-4; Wed, 06 Apr 2022 22:45:41 +0000 From: Dai Ngo To: chuck.lever@oracle.com, bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC v20 03/10] NFSD: Update nfsd_breaker_owns_lease() to handle courtesy client Date: Wed, 6 Apr 2022 15:45:26 -0700 Message-Id: <1649285133-16765-4-git-send-email-dai.ngo@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1649285133-16765-1-git-send-email-dai.ngo@oracle.com> References: <1649285133-16765-1-git-send-email-dai.ngo@oracle.com> X-Proofpoint-ORIG-GUID: nJZ0-yZGQk6wQjmJaiLfrVV89aIQ6TQK X-Proofpoint-GUID: nJZ0-yZGQk6wQjmJaiLfrVV89aIQ6TQK X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Update nfsd_breaker_owns_lease() to handle delegation conflict with courtesy client by calling nfsd4_expire_courtesy_clnt. Signed-off-by: Dai Ngo --- fs/nfsd/nfs4state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 80772662236b..f20c75890594 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4727,6 +4727,9 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl) struct svc_rqst *rqst; struct nfs4_client *clp; + if (nfsd4_expire_courtesy_clnt(dl->dl_stid.sc_client)) + return true; + if (!i_am_nfsd()) return false; rqst = kthread_data(current); -- 2.9.5