leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gfs2: Use IS_ERR_OR_NULL

Browse Source 
Use IS_ERR_OR_NULL where appropriate.

(Several more places converted by Andreas.)

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
Kefeng Wang 2019-06-05 22:24:24 +08:00 committed by Andreas Gruenbacher
parent 2a27b755ed
commit 15a798f7de
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/gfs2/dir.c
View File

@ -750,7 +750,7 @@ static struct gfs2_dirent *gfs2_dirent_split_alloc(struct inode *inode,
struct gfs2_dirent *dent; struct gfs2_dirent *dent;
dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size,
gfs2_dirent_find_offset, name, ptr); gfs2_dirent_find_offset, name, ptr);
if (!dent || IS_ERR(dent)) if (IS_ERR_OR_NULL(dent))
return dent; return dent;
return do_init_dirent(inode, dent, name, bh, return do_init_dirent(inode, dent, name, bh,
(unsigned)(ptr - (void *)dent)); (unsigned)(ptr - (void *)dent));
@ -854,7 +854,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode,
return ERR_PTR(error); return ERR_PTR(error);
dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, scan, name, NULL); dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, scan, name, NULL);
got_dent: got_dent:
if (unlikely(dent == NULL || IS_ERR(dent))) { if (IS_ERR_OR_NULL(dent)) {
brelse(bh); brelse(bh);
bh = NULL; bh = NULL;
} }

2
fs/gfs2/glock.c
View File

@ -681,7 +681,7 @@ static void delete_work_func(struct work_struct *work)
goto out; goto out;
inode = gfs2_lookup_by_inum(sdp, no_addr, NULL, GFS2_BLKST_UNLINKED); inode = gfs2_lookup_by_inum(sdp, no_addr, NULL, GFS2_BLKST_UNLINKED);
if (inode && !IS_ERR(inode)) { if (!IS_ERR_OR_NULL(inode)) {
d_prune_aliases(inode); d_prune_aliases(inode);
iput(inode); iput(inode);
} }

2
fs/gfs2/inode.c
View File

@ -793,7 +793,7 @@ fail_free_acls:
fail_gunlock: fail_gunlock:
gfs2_dir_no_add(&da); gfs2_dir_no_add(&da);
gfs2_glock_dq_uninit(ghs); gfs2_glock_dq_uninit(ghs);
if (inode && !IS_ERR(inode)) { if (!IS_ERR_OR_NULL(inode)) {
clear_nlink(inode); clear_nlink(inode);
if (!free_vfs_inode) if (!free_vfs_inode)
mark_inode_dirty(inode); mark_inode_dirty(inode);

2
fs/gfs2/ops_fstype.c
View File

@ -576,7 +576,7 @@ static int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)
INIT_WORK(&jd->jd_work, gfs2_recover_func); INIT_WORK(&jd->jd_work, gfs2_recover_func);
jd->jd_inode = gfs2_lookupi(sdp->sd_jindex, &name, 1); jd->jd_inode = gfs2_lookupi(sdp->sd_jindex, &name, 1);
if (!jd->jd_inode || IS_ERR(jd->jd_inode)) { if (IS_ERR_OR_NULL(jd->jd_inode)) {
if (!jd->jd_inode) if (!jd->jd_inode)
error = -ENOENT; error = -ENOENT;
else else