From patchwork Mon Nov 2 16:24:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenle Chen X-Patchwork-Id: 11874453 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A542B92C for ; Mon, 2 Nov 2020 16:25:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8910422268 for ; Mon, 2 Nov 2020 16:25:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rsZz/krF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726878AbgKBQYy (ORCPT ); Mon, 2 Nov 2020 11:24:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726766AbgKBQYw (ORCPT ); Mon, 2 Nov 2020 11:24:52 -0500 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F4B7C0617A6; Mon, 2 Nov 2020 08:24:52 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id r186so11235206pgr.0; Mon, 02 Nov 2020 08:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2ZBqQ4wCTpFo7JQ/+ZUdkertgFqpSFCteIYsSJlfASc=; b=rsZz/krFx0jK9y6bXMs3iWIGx8wex+Sn7NY5d283V9Rf2EYiEjrs0pou22IPGHWbR1 618qd59AiNQh2F3ZocneQqEhu9Ru+zhmvig3PJM3v6YfrvMy6coywqr3yTN1S6tJz+B5 1sqq7vXRvE1U6nDZmVgCbEYPB8wF3b/YjlwPcZxLKCzt+QnX1sO6v5xMOf/txGt4CLVC AXEPwTVS6eeNzoZs+ZCBz16h+y4QgG4ms8P/U/8paQ82bSbwAd+PxPdy/ZWGuZPiG3sz 27TWa644SJJx6AgU1bUNsh+n9inh/OBBCNClEVIXvE/VYZN82trXVURngWJZIOdHbG4h 0+6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2ZBqQ4wCTpFo7JQ/+ZUdkertgFqpSFCteIYsSJlfASc=; b=qRSMy+GfKFcVL5kKsH/uUrSOW4fOHMbqWKRcCRhn11dKTY5XROh1+nQefZFOc/PyfJ Sr18ucfd7jgAwcsxEmUZaxgOrtDjNCXgJub3s7EpobIrieK2MgAh0TwiSTt5NLs2T8w/ 8t6SoStGVDlpbxcu4uad82cAx7VfL0W7+uK4yopC9drKP8RBCEHWI1skUCRSw8whY0VR U/KHBGHEGHRxhFgD6RJOKNAoAmCXS1D+mhOXVkHBwDU+fJwzFHdvmcUcrmrnh/AtCGy/ snTcdLFkdM4zbavT9IPMSMcxN2KGOczMuP2yrtitOXtAZ+nXvqOqpmUhvAXOWEnY+VoT msXw== X-Gm-Message-State: AOAM531bFF2vKGL2fQupo1abuLxPlXLvkQBrvSxaO+MFHcpI7GOz7/WG rA0wmbnFnvEtE/dWYcM+zrQ= X-Google-Smtp-Source: ABdhPJw3OFfZGzCC6bbK6rTbkBKAFDn39btr/v3RYXaunJQd/g8dMiQizc5Erh3vgL0ueVT4cZJHQA== X-Received: by 2002:a17:90b:17c7:: with SMTP id me7mr18575577pjb.127.1604334292212; Mon, 02 Nov 2020 08:24:52 -0800 (PST) Received: from opensuse.lan (173.28.92.34.bc.googleusercontent.com. [34.92.28.173]) by smtp.googlemail.com with ESMTPSA id b29sm8379575pff.194.2020.11.02.08.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 08:24:51 -0800 (PST) From: Wenle Chen X-Google-Original-From: Wenle Chen To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, chenwenle@huawei.com, solachenclever@hotmail.com, nixiaoming@huawei.com, solachenclever@gmail.com Subject: [PATCH 1/2] NFS: Reduce redundant comparison Date: Tue, 3 Nov 2020 00:24:37 +0800 Message-Id: <20201102162438.14034-2-chenwenle@huawei.com> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201102162438.14034-1-chenwenle@huawei.com> References: <20201102162438.14034-1-chenwenle@huawei.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org The err wouldn't be change after sleep. There is no need to compare err and -NFS4ERR_DELAY Signed-off-by: Wenle Chen --- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 9e0ca9b2b210..f6b5dc792b33 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7399,7 +7399,7 @@ int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state, if (err != -NFS4ERR_DELAY) break; ssleep(1); - } while (err == -NFS4ERR_DELAY); + } while (1); return nfs4_handle_delegation_recall_error(server, state, stateid, fl, err); } From patchwork Mon Nov 2 16:24:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenle Chen X-Patchwork-Id: 11874451 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC79F92C for ; Mon, 2 Nov 2020 16:25:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9F96208B6 for ; Mon, 2 Nov 2020 16:25:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Th9lyTDK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726834AbgKBQY7 (ORCPT ); Mon, 2 Nov 2020 11:24:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727057AbgKBQYz (ORCPT ); Mon, 2 Nov 2020 11:24:55 -0500 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B2A2C0617A6; Mon, 2 Nov 2020 08:24:55 -0800 (PST) Received: by mail-pf1-x443.google.com with SMTP id o129so11548524pfb.1; Mon, 02 Nov 2020 08:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b/OZ8HTZ7OhKXvD7+u0886Hzbgg8nYkTvZEoAZO/9hE=; b=Th9lyTDK1FnMIa6sXygE30/GZFlqBziQAnhCPoDJ7wZv0q1G7Flj0yTRhY2NuxExgM v93a3jhDELYrN++eD55Vi5VTvQv/XEFFVcBxUXjLS4fn1Fari4vygY0crRqECJK+eTmy akLWU/Y77lSfXqbwTSqpDDzXw9BU5RIPUpeIqI4jCQ/IC6oUSaZ4fxfMdPraj4Ex/Lh4 fJ8MX2COPRWVYgv3iwQCcTGj/Ay4iP+n9WYKWEOjomdz2f9ZOYD6EpudJJBIHZHv0RtY gZFCxv902bmM35r+fEL5z3PE5gUDy62IkBlHFCLZRN752sOtuSZDOQtVVpedQyO3/at3 OR3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b/OZ8HTZ7OhKXvD7+u0886Hzbgg8nYkTvZEoAZO/9hE=; b=odgVu8XjLc3kdDRW+Ayssqv5Dk+4SXfgk3o6qIWGs7mPIWXfikvqbbjd0ng1W70wVT yHJll3M+FK3Lxwr0pj7acWb58tK/yvGzsqlQdS42KfOCqWHVjn2NIoqZALkIT8++sYJO BGJHfWSDV4+8R3V7f13nOfMGqdhntgzs5jYhp1G4cTCtIM3uKnJTaWkPMJfooA5P1YJn sqj7b2CES7CpwJZfF2tngdif4tY9Y8AyykhHw3H/4X+1vMqlst4e/Lj3qWbz5VhI9sLF vaH5dKzqwJLo1UY4wp1bvQXIzxHJBMcSBQ8l3RUKKStWy6LPOLTqk1BAHKIZO+0Q3pIc iQlw== X-Gm-Message-State: AOAM530DE7Wea2twKhvAayoJtomdepSDZjjP1e77Z9KKnLnIRpli7hBL WIW+GSnCBpzGDfJX6TyBRyM= X-Google-Smtp-Source: ABdhPJxgrk43v5H1bMEkCwTxLoq6l/p2ICSc6SsTxCqt4fWaW2f0yGVO/f72gldWyUDk8bHxjWn9Ww== X-Received: by 2002:a17:90a:588d:: with SMTP id j13mr17600158pji.236.1604334294719; Mon, 02 Nov 2020 08:24:54 -0800 (PST) Received: from opensuse.lan (173.28.92.34.bc.googleusercontent.com. [34.92.28.173]) by smtp.googlemail.com with ESMTPSA id b29sm8379575pff.194.2020.11.02.08.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 08:24:54 -0800 (PST) From: Wenle Chen X-Google-Original-From: Wenle Chen To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, chenwenle@huawei.com, solachenclever@hotmail.com, nixiaoming@huawei.com, solachenclever@gmail.com Subject: [PATCH 2/2] NFS: Limit the number of retries Date: Tue, 3 Nov 2020 00:24:38 +0800 Message-Id: <20201102162438.14034-3-chenwenle@huawei.com> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201102162438.14034-1-chenwenle@huawei.com> References: <20201102162438.14034-1-chenwenle@huawei.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org We can't wait forever, even if the state is always delayed. Signed-off-by: Wenle Chen --- fs/nfs/nfs4proc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index f6b5dc792b33..bb2316bf13f6 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7390,15 +7390,17 @@ int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state, { struct nfs_server *server = NFS_SERVER(state->inode); int err; + int retry = 3; err = nfs4_set_lock_state(state, fl); if (err != 0) return err; do { err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW); - if (err != -NFS4ERR_DELAY) + if (err != -NFS4ERR_DELAY || retry == 0) break; ssleep(1); + --retry; } while (1); return nfs4_handle_delegation_recall_error(server, state, stateid, fl, err); }