Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle.
To: Ilya Dryomov <[email protected]> To: Alex Markuze <[email protected]> To: Viacheslav Dubeyko <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Philipp Hahn <[email protected]> --- fs/ceph/dir.c | 2 +- fs/ceph/snap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 86d7aa594ea99335af3e91a95c0a418fdc1b8a8a..934250748ae4fd4c148fd27bdf91175047c2877d 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -889,7 +889,7 @@ int ceph_handle_notrace_create(struct inode *dir, struct dentry *dentry) { struct dentry *result = ceph_lookup(dir, dentry, 0); - if (result && !IS_ERR(result)) { + if (!IS_ERR_OR_NULL(result)) { /* * We created the item, then did a lookup, and found * it was already linked to another inode we already diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 52b4c2684f922bfed39550311e793bfe3622cd26..528ad581be160713f91416115659e2dc6f259576 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -902,7 +902,7 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc, bad: err = -EIO; fail: - if (realm && !IS_ERR(realm)) + if (!IS_ERR_OR_NULL(realm)) ceph_put_snap_realm(mdsc, realm); if (first_realm) ceph_put_snap_realm(mdsc, first_realm); -- 2.43.0
