lkml.org 
[lkml]   [2019]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] fs: gfs2: Use IS_ERR_OR_NULL
From
Date


On 2019/6/12 0:23, Andreas Gruenbacher wrote:
> Kefeng,
>
> On Wed, 5 Jun 2019 at 16:17, Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>> Use IS_ERR_OR_NULL where appropriate.
>
> It seems there are several more instances in which IS_ERR_OR_NULL should
> be used (see below).
>

Right, will collect the following changes and send a new one, thanks.

> Thanks,
> Andreas
>
> ---
> fs/gfs2/dir.c | 2 +-
> fs/gfs2/glock.c | 2 +-
> fs/gfs2/inode.c | 2 +-
> fs/gfs2/ops_fstype.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
> index 3925efd3fd83..761a37a3c656 100644
> --- a/fs/gfs2/dir.c
> +++ b/fs/gfs2/dir.c
> @@ -753,7 +753,7 @@ static struct gfs2_dirent *gfs2_dirent_split_alloc(struct inode *inode,
> struct gfs2_dirent *dent;
> dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size,
> gfs2_dirent_find_offset, name, ptr);
> - if (!dent || IS_ERR(dent))
> + if (IS_ERR_OR_NULL(dent))
> return dent;
> return do_init_dirent(inode, dent, name, bh,
> (unsigned)(ptr - (void *)dent));
> diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
> index 15c605cfcfc8..f6281470a182 100644
> --- a/fs/gfs2/glock.c
> +++ b/fs/gfs2/glock.c
> @@ -684,7 +684,7 @@ static void delete_work_func(struct work_struct *work)
> goto out;
>
> 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);
> iput(inode);
> }
> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> index 998051c4aea7..1cc99da705fc 100644
> --- a/fs/gfs2/inode.c
> +++ b/fs/gfs2/inode.c
> @@ -796,7 +796,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
> fail_gunlock:
> gfs2_dir_no_add(&da);
> gfs2_glock_dq_uninit(ghs);
> - if (inode && !IS_ERR(inode)) {
> + if (!IS_ERR_OR_NULL(inode)) {
> clear_nlink(inode);
> if (!free_vfs_inode)
> mark_inode_dirty(inode);
> diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
> index f5312f3b58ee..d35772d90b0a 100644
> --- a/fs/gfs2/ops_fstype.c
> +++ b/fs/gfs2/ops_fstype.c
> @@ -579,7 +579,7 @@ static int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)
>
> INIT_WORK(&jd->jd_work, gfs2_recover_func);
> 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)
> error = -ENOENT;
> else
>

\
 
 \ /
  Last update: 2019-06-12 03:08    [W:0.177 / U:0.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site