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 8d417b4a0e80a104425f86823ff6a3699f2ed81b..a6fcbde540a7ed6e84071ec5f8a5113fd26ca611 100644 (file)
--- 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 237f13a11df3c8a654d7890ab1e136596a8279c8..8707189be1c30f4e8e6d95f2173196669047362e 100644 (file)
--- 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);