From patchwork Tue Oct 18 04:07:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katrin Jo X-Patchwork-Id: 3925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1767790wrs; Mon, 17 Oct 2022 21:16:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5PtFFHjuqSrTmGF1iUx4jBAiG4wE1+TWono7bV9BYdVwgqarHo1FANdmfvVJk/T/wBYHZZ X-Received: by 2002:a05:6a00:4093:b0:563:2d96:8f44 with SMTP id bw19-20020a056a00409300b005632d968f44mr1005850pfb.4.1666066569307; Mon, 17 Oct 2022 21:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666066569; cv=none; d=google.com; s=arc-20160816; b=gloWeBe0dA1oLdURZtrUOjxPnOm+Zv1ZWhXYwBjc8MHRCqEJm1xcIfETjKB7pmPS9Q uh+UxFcn8YiRazG8Hqo1lHQAGjjv2Kn5okq7WHe0EW0j83zsFDRPGxJm1asf6NX3qUhm nC79aWiSbnvm/IQJylywcSiKx5ZhjOfSonTJkhVg0ws8nFi0Az07OnzmU+JkVjXyHqOQ 2h3gHgvWMF//8LhaqE4EWXStkYYYIROdmXotuo3tknda5bwTze79roET+DjvjFdceXTc +RpsctQVcr2tz8VC32q+eO4Im0Vpm+YYQhrdZDpfCKn+6B+hnW2XCj2m6ZiGJDWaWjrw bDvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=uW1kxYY0TQ6+a/b17x4JrJXSQoPu6SYrVMBQ5HcdhcY=; b=T1aEkdSoDnRg9mI+pAK954EfdcnS00r7Vwu+gRfd/VDVxqeSxXuJp/OZ+gpEJyXDX3 nUFmEuSyAw6QtB5bsZoSXLYzG/jlUvhjmvpCTdO48AF7zI5ml67avFPKsMqY8iNkBCy1 xpXlMBxqmFzpABofjVk8ZsFG7wFrKcURlLa6gc7ewJYFv1IwkbDvN6as9iKFCeoYuBHn FbFzNGmBNGl2fI/pFhgvdeHrSVGGj/qt8c+l1O5fi9bnykB3BtH/luHvEbnX+hqiUJw8 JD1Lb1ZldmLXVdDs2HM2s592RUho50Ez5GTXvGQichcQ7VtXiiLiDE8LI8kH6xqL8MxE o+tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bpoMKjCq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bx25-20020a056a00429900b0052d9e5f07d9si12524386pfb.210.2022.10.17.21.15.56; Mon, 17 Oct 2022 21:16:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@gmail.com header.s=20210112 header.b=bpoMKjCq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230233AbiJREHq (ORCPT + 99 others); Tue, 18 Oct 2022 00:07:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231187AbiJREHZ (ORCPT ); Tue, 18 Oct 2022 00:07:25 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4ED186AE8D; Mon, 17 Oct 2022 21:07:20 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id h2so5315700plb.2; Mon, 17 Oct 2022 21:07:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=uW1kxYY0TQ6+a/b17x4JrJXSQoPu6SYrVMBQ5HcdhcY=; b=bpoMKjCqc253jmF/9weUT0Z+MLQiJhKwArMTaoHraD40d3Qm6F0P0bj9EVyeVfLYQ3 4zdwdY33opJMqnzdrhv4Jbz6AHgU7MtSdVJJz5YGkLG+p3Ur920Uf0e6DTvZ+HvBoDH8 0jE+3XpXj5Zq1A4vqTz/QNqCBJtqriTS3KyHRlm6nnFSVZ032zZ3gC+GkFbDMjjmAJF4 nB/wxDKQLujI5YgtbSh8FnQXrqDfTVGEoFBRGZid5fQ2n0ymYjXPV9QIhhWoXNVgNqEG 5Ll5hAh4uIaqk6LX2MMRc1IkqeBI9hg9NOPKtxa/GG3EQdfrH5YgvVWz2FznX/JOmttG sIag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uW1kxYY0TQ6+a/b17x4JrJXSQoPu6SYrVMBQ5HcdhcY=; b=qrWiQtsmuDTPmAh3dg0VLIa1F2MigBLQX8K0vTeOHYBi4oowo7gXADdRDzV0dPhnbb xGBXxfoRxWMxp7hvlhBr0Fqy12A3snPWAISZ3yZhpBtC+67r6/hjgbTruksjWDrHPBEa CY2MU8CuSQoJQKabUzVjUuRUXXpbk9MstyJlo5EldR9BrKqRAMSpAQEyqcNEeQvyfkID A92tSnPfL8UqC31G+R62NU+SBWpMX+P72e/yYVJZ6HTG5M6GcycE2mh1Yq1nb0Fro4Mf nYjYQ7AoKDhuHnQpz/yZPrvHMruqdg1hwSS4kJGe9hVmYUwHiJoFNyBiaGPUkUpc2Hil Kc6A== X-Gm-Message-State: ACrzQf3bMGZLRK64mIg3265AcAQP+LDn5rDgz9lSzUtlp3YwmMG/O7cg /gYc+oyNWisuIPKtEsl0TlaPQ/ZhljEjKg== X-Received: by 2002:a17:902:e5c2:b0:186:2df3:c73 with SMTP id u2-20020a170902e5c200b001862df30c73mr1093287plf.30.1666066040010; Mon, 17 Oct 2022 21:07:20 -0700 (PDT) Received: from localhost.localdomain ([43.132.141.9]) by smtp.gmail.com with ESMTPSA id j9-20020a170902da8900b00174f7d10a03sm7460183plx.86.2022.10.17.21.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 21:07:19 -0700 (PDT) From: zys.zljxml@gmail.com To: trond.myklebust@hammerspace.com, anna@kernel.org Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Yushan Zhou Subject: [PATCH] nfs: Remove redundant null checks before kfree Date: Tue, 18 Oct 2022 12:07:08 +0800 Message-Id: <20221018040708.3801248-1-zys.zljxml@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,HK_RANDOM_ENVFROM, HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746997419222612250?= X-GMAIL-MSGID: =?utf-8?q?1746997419222612250?= From: Yushan Zhou Fix the following coccicheck warning: fs/nfs/dir.c:2494:2-7: WARNING: NULL check before some freeing functions is not needed. Signed-off-by: Yushan Zhou --- fs/nfs/dir.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 58036f657126..f594dac436a7 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -2489,9 +2489,8 @@ int nfs_unlink(struct inode *dir, struct dentry *dentry) spin_unlock(&dentry->d_lock); goto out; } - if (dentry->d_fsdata) - /* old devname */ - kfree(dentry->d_fsdata); + /* old devname */ + kfree(dentry->d_fsdata); dentry->d_fsdata = NFS_FSDATA_BLOCKED; spin_unlock(&dentry->d_lock);