]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ntfs: remove unnecessary NULL checks before kfree
authorNamjae Jeon <linkinjeon@kernel.org>
Thu, 21 May 2026 12:30:01 +0000 (21:30 +0900)
committerNamjae Jeon <linkinjeon@kernel.org>
Fri, 5 Jun 2026 15:20:08 +0000 (00:20 +0900)
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>
fs/ntfs/logfile.c
fs/ntfs/super.c

index d3f25d8e29f9d28b956cce21fe52655631a935e7..9df8c3095ca48d5675d98b71558bbdeb280b2258 100644 (file)
@@ -622,8 +622,7 @@ is_empty:
        ntfs_debug("Done.");
        return true;
 err_out:
-       if (rstr1_ph)
-               kvfree(rstr1_ph);
+       kvfree(rstr1_ph);
        return false;
 }
 
index 312acb41c2ed5d9fdce9873705d276b056d0efb0..2a5ad7d56bc268251fa89ab03079b030fd02c3f9 100644 (file)
@@ -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);
 }