From: Hyunchul Lee <hyc.lee@gmail.com>
Date: Wed, 11 Mar 2026 02:13:51 +0000 (+0900)
Subject: ntfs: prefer IS_ERR_OR_NULL() over manual NULL check
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cf4b3c768fda4076af25d5c4bb4a6267e32d42d;p=thirdparty%2Fkernel%2Flinux.git

ntfs: prefer IS_ERR_OR_NULL() over manual NULL check

Use IS_ERR_OR_NULL() instead of manual NULL and IS_ERR() checks.

Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---

diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index 8d417b4a0e80a..a6fcbde540a7e 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -593,7 +593,7 @@ err_out:
 		unmap_mft_record(dir_ni);
 	kfree(name);
 	*res = NULL;
-	if (ia_vi && !IS_ERR(ia_vi))
+	if (!IS_ERR_OR_NULL(ia_vi))
 		iput(ia_vi);
 	return ERR_MREF(err);
 dir_err_out:
diff --git a/fs/ntfs/lcnalloc.c b/fs/ntfs/lcnalloc.c
index 237f13a11df3c..8707189be1c30 100644
--- a/fs/ntfs/lcnalloc.c
+++ b/fs/ntfs/lcnalloc.c
@@ -721,7 +721,7 @@ out:
 		rl[rlpos].lcn = is_extension ? LCN_ENOENT : LCN_RL_NOT_MAPPED;
 		rl[rlpos].length = 0;
 	}
-	if (likely(folio && !IS_ERR(folio))) {
+	if (!IS_ERR_OR_NULL(folio)) {
 		if (need_writeback) {
 			ntfs_debug("Marking page dirty.");
 			folio_mark_dirty(folio);