Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle.
To: Konstantin Komarov <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Philipp Hahn <[email protected]> --- fs/ntfs3/fsntfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index 0df2aa81d8845f21bfb571c408bd65b9e1fb8128..3ced4f95c2e95bac1fe5b334f976b8c8a15cf19d 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -237,7 +237,7 @@ int ntfs_extend_init(struct ntfs_sb_info *sbi) /* Try to find $ObjId */ inode2 = dir_search_u(inode, &NAME_OBJID, NULL); - if (inode2 && !IS_ERR(inode2)) { + if (!IS_ERR_OR_NULL(inode2)) { if (is_bad_inode(inode2)) { iput(inode2); } else { @@ -248,21 +248,21 @@ int ntfs_extend_init(struct ntfs_sb_info *sbi) /* Try to find $Quota */ inode2 = dir_search_u(inode, &NAME_QUOTA, NULL); - if (inode2 && !IS_ERR(inode2)) { + if (!IS_ERR_OR_NULL(inode2)) { sbi->quota_no = inode2->i_ino; iput(inode2); } /* Try to find $Reparse */ inode2 = dir_search_u(inode, &NAME_REPARSE, NULL); - if (inode2 && !IS_ERR(inode2)) { + if (!IS_ERR_OR_NULL(inode2)) { sbi->reparse.ni = ntfs_i(inode2); sbi->reparse_no = inode2->i_ino; } /* Try to find $UsnJrnl */ inode2 = dir_search_u(inode, &NAME_USNJRNL, NULL); - if (inode2 && !IS_ERR(inode2)) { + if (!IS_ERR_OR_NULL(inode2)) { sbi->usn_jrnl_no = inode2->i_ino; iput(inode2); } -- 2.43.0
