Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp6846474ybi; Wed, 5 Jun 2019 07:18:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZlZGIKH6NWk/UIMmXwHYLhLg03GPTwS0LgXOu5ZU/EBcgbV7Xl43vx8/JQZUglrrVhK+H X-Received: by 2002:a17:902:760f:: with SMTP id k15mr18792715pll.125.1559744306935; Wed, 05 Jun 2019 07:18:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559744306; cv=none; d=google.com; s=arc-20160816; b=d94HhQQloDXC9zJrejWDF0yJ7YlnRhTh0ytqYjCmZGsx87ci2eKr005CnL9Yh2WExm 7eCNzk0MdgrGDTNiI8dmHdm89hnpDRXYTHSvnlDmC7pVUqZUe4AbcNu505gaeeBr+D1z o0hWBm2XZWGGc26qwaYiHHhSSGpGn1svG75iX8g0C+uT9k2k1UzOAP49R0ZUW1weeGvG BiTssrNv6T4bNGCtOZ/wuZ1JIcnZN454L8YnHIYdq0f9dXWOukxo7ZRGVMFO3gsjpEwX Kb8VT2ZzxB4QAZ3UsxRBCUI/fiPdFOESs6gCknis2Y2EJgTGqeXQiK9TQiw5OPe9OkaU Nflg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=24f7Z3rfUFHCDunretnEZTRVxBOWplSJJ3LpMYS0GUo=; b=XwSpvSIDyKn3hq6cd+bRaa5twLxD8UM5NdXEJu2cx9KVpKUim1dqUGnOal+mpNXTbJ UtG45MnQBzRe+53SfZ7j1ten4IVnjm0PThZeBp2sRHacaitvMewdvgWiJZZ1heTWKb4u sThtCAoK0hOfnVAC/FMfnj47cyxDgxs1wZibxNAmmOqmo3UuYEj5Ob4Mp8O2vnvXY3wc 0hPqdFqW1RrJJVN5QElZRczuKnlwh0nG9DqRhB06UJPzZ4YrRhjQFjPw/SNCPGf6cNoS kqUo1NMCKdzq6tgkorqo7YgyX/wugB9FhcVbeoIyMJMB/xRN0JNelHo2z4R8cLMNWeY7 ygFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k15si26341580pgh.331.2019.06.05.07.18.08; Wed, 05 Jun 2019 07:18:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728373AbfFEOQs (ORCPT + 99 others); Wed, 5 Jun 2019 10:16:48 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:18085 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728116AbfFEOQr (ORCPT ); Wed, 5 Jun 2019 10:16:47 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 0A7A0CBCC519B925B9D5; Wed, 5 Jun 2019 22:16:46 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Wed, 5 Jun 2019 22:16:35 +0800 From: Kefeng Wang To: CC: Kefeng Wang , Bob Peterson , Andreas Gruenbacher , Subject: [PATCH] fs: gfs2: Use IS_ERR_OR_NULL Date: Wed, 5 Jun 2019 22:24:24 +0800 Message-ID: <20190605142428.84784-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use IS_ERR_OR_NULL where appropriate. Cc: Bob Peterson Cc: Andreas Gruenbacher Cc: cluster-devel@redhat.com Signed-off-by: Kefeng Wang --- fs/gfs2/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index db9a05244a35..3925efd3fd83 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -857,7 +857,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode, return ERR_PTR(error); dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, scan, name, NULL); got_dent: - if (unlikely(dent == NULL || IS_ERR(dent))) { + if (IS_ERR_OR_NULL(dent)) { brelse(bh); bh = NULL; } -- 2.20.1