Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2220166pxj; Sun, 9 May 2021 19:42:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwP/uhvdGGJfE4uSi5ybU+l56aPuiodT5FRaZdjR1dW09dYHxYH3y2woyAs8ml/Hn/AYyaR X-Received: by 2002:a50:ec89:: with SMTP id e9mr26823010edr.347.1620614575669; Sun, 09 May 2021 19:42:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620614575; cv=none; d=google.com; s=arc-20160816; b=JsbpcyXfLhO77FNwnUyVPmZzLVwzMJtY357os8AIY6Gt103b7MNxHsDD+mgBcVyK5h UHIgYVyhZZrWLKjAQ7GGlbG37Ee+zv7h1apvt6/8is+A+upVD+oAG9dwW2PSdaNr8GfM 7kz74d1I7hUXORwbIB/GdPoIc03+wwkqAmG5X+RQ0XNDdmN8rChU4/GN81JIhNDB6l7+ 8shsYFkOOgEsWHMrIkmsN4AkTCqV1Yc2tg8YDGLqbV/2fMbeU3U6Z9Qhw8PdGd27QSaJ g2Lck2Z/fLELT2tgTXxV7kAMJNjXcboDVRvq5ccElV3xjPLK27L4pRdxgc5z/oTggsv/ kOYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=l+cGzWM7nSGsuCAx7Pjuxm8VNYy8qWCxW1PHyYxmnI0=; b=VwoUsXBiVuyq8bkFntCdwAJfQYTlCJ3Jty8Kp+dmVDXKDBZ++1Qqp+3z01bD0KjI1o 7DYFcQsRKb0owKVC8bLvLm/WwsH9+oM8yMvRi2x/3/xpkW5+y5PAWOUR8z4zaYWlbSmT BfI2oifd+olHB1ru6aDW5E12k2vGtrL93o885zQ2GiK3WtLMO6MEFPEJfz7ABiMnCE4r EDyN9Jc0nyzwPnbNFRL6OGjY2P/LtW6BASBHDxgMd3Ou0b/FWLfOdZiVtI8qG7JHYHuF wpX+FnExkKwzNYLLfp8+wfr2496OkNfn6Ttkdm1acWa2ucH1sAdld3QR8y5HNcKxRIxp JWJA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z28si13475968edm.490.2021.05.09.19.42.32; Sun, 09 May 2021 19:42:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230200AbhEJCfu (ORCPT + 99 others); Sun, 9 May 2021 22:35:50 -0400 Received: from mail-m17670.qiye.163.com ([59.111.176.70]:18698 "EHLO mail-m17670.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229932AbhEJCft (ORCPT ); Sun, 9 May 2021 22:35:49 -0400 Received: from ubuntu.localdomain (unknown [36.152.145.182]) by mail-m17670.qiye.163.com (Hmail) with ESMTPA id F0BC33C0137; Mon, 10 May 2021 10:34:43 +0800 (CST) From: zhouchuangao To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, zhouchuangao Subject: [PATCH] fs/nfs: Use fatal_signal_pending instead of signal_pending Date: Sun, 9 May 2021 19:34:37 -0700 Message-Id: <1620614077-73633-1-git-send-email-zhouchuangao@vivo.com> X-Mailer: git-send-email 2.7.4 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZQk1CGVZDTUsdH0IeTE4aH0hVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWUFZT0tIVUpKS0 hKQ1VLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6PxQ6Vhw6MT8VTj8hIgsjTAs6 DjoKCSJVSlVKTUlLTUpPS0NPT0hDVTMWGhIXVQETFA4YEw4aFRwaFDsNEg0UVRgUFkVZV1kSC1lB WUhNVUpOSVVKT05VSkNJWVdZCAFZQUpDQkk3Bg++ X-HM-Tid: 0a79542075f8da5akuwsf0bc33c0137 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We set the state of the current process to TASK_KILLABLE via prepare_to_wait(). Should we use fatal_signal_pending() to detect the signal here? Signed-off-by: zhouchuangao --- fs/nfs/nfs4proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 87d04f2..0cd9658 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1706,7 +1706,7 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state, rcu_read_unlock(); trace_nfs4_open_stateid_update_wait(state->inode, stateid, 0); - if (!signal_pending(current)) { + if (!fatal_signal_pending(current)) { if (schedule_timeout(5*HZ) == 0) status = -EAGAIN; else @@ -3487,7 +3487,7 @@ static bool nfs4_refresh_open_old_stateid(nfs4_stateid *dst, write_sequnlock(&state->seqlock); trace_nfs4_close_stateid_update_wait(state->inode, dst, 0); - if (signal_pending(current)) + if (fatal_signal_pending(current)) status = -EINTR; else if (schedule_timeout(5*HZ) != 0) -- 2.7.4