From: Namjae Jeon <linkinjeon@kernel.org>
Date: Thu, 21 May 2026 12:30:01 +0000 (+0900)
Subject: ntfs: remove unnecessary NULL checks before kfree
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3964169d68ed282ccf0f7aac80f6606723280e04;p=thirdparty%2Flinux.git

ntfs: remove unnecessary NULL checks before kfree

NULL check before kfree() is unnecessary and triggers coccinelle warnings.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---

diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c
index d3f25d8e29f9..9df8c3095ca4 100644
--- a/fs/ntfs/logfile.c
+++ b/fs/ntfs/logfile.c
@@ -622,8 +622,7 @@ is_empty:
 	ntfs_debug("Done.");
 	return true;
 err_out:
-	if (rstr1_ph)
-		kvfree(rstr1_ph);
+	kvfree(rstr1_ph);
 	return false;
 }
 
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 312acb41c2ed..2a5ad7d56bc2 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1634,7 +1634,7 @@ static void ntfs_volume_free(struct ntfs_volume *vol)
 		vol->upcase = NULL;
 	}
 
-	if (!ntfs_nr_upcase_users && default_upcase) {
+	if (!ntfs_nr_upcase_users) {
 		kvfree(default_upcase);
 		default_upcase = NULL;
 	}
@@ -1649,8 +1649,7 @@ static void ntfs_volume_free(struct ntfs_volume *vol)
 
 	unload_nls(vol->nls_map);
 
-	if (vol->lcn_empty_bits_per_page)
-		kvfree(vol->lcn_empty_bits_per_page);
+	kvfree(vol->lcn_empty_bits_per_page);
 	kfree(vol->volume_label);
 	kfree(vol);
 }