* [Cluster-devel] [PATCH] fs: gfs2: Use IS_ERR_OR_NULL
@ 2019-06-05 14:24 Kefeng Wang
2019-06-11 16:23 ` Andreas Gruenbacher
0 siblings, 1 reply; 4+ messages in thread
From: Kefeng Wang @ 2019-06-05 14:24 UTC (permalink / raw)
To: cluster-devel.redhat.com
Use IS_ERR_OR_NULL where appropriate.
Cc: Bob Peterson <rpeterso@redhat.com>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: cluster-devel at redhat.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
fs/gfs2/dir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index db9a05244a35..3925efd3fd83 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -857,7 +857,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode,
return ERR_PTR(error);
dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, scan, name, NULL);
got_dent:
- if (unlikely(dent == NULL || IS_ERR(dent))) {
+ if (IS_ERR_OR_NULL(dent)) {
brelse(bh);
bh = NULL;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Cluster-devel] [PATCH] fs: gfs2: Use IS_ERR_OR_NULL
2019-06-05 14:24 [Cluster-devel] [PATCH] fs: gfs2: Use IS_ERR_OR_NULL Kefeng Wang
@ 2019-06-11 16:23 ` Andreas Gruenbacher
2019-06-12 1:07 ` Kefeng Wang
2019-06-12 1:17 ` [Cluster-devel] [PATCH v2] " Kefeng Wang
0 siblings, 2 replies; 4+ messages in thread
From: Andreas Gruenbacher @ 2019-06-11 16:23 UTC (permalink / raw)
To: cluster-devel.redhat.com
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).
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
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Cluster-devel] [PATCH] fs: gfs2: Use IS_ERR_OR_NULL
2019-06-11 16:23 ` Andreas Gruenbacher
@ 2019-06-12 1:07 ` Kefeng Wang
2019-06-12 1:17 ` [Cluster-devel] [PATCH v2] " Kefeng Wang
1 sibling, 0 replies; 4+ messages in thread
From: Kefeng Wang @ 2019-06-12 1:07 UTC (permalink / raw)
To: cluster-devel.redhat.com
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] [PATCH v2] fs: gfs2: Use IS_ERR_OR_NULL
2019-06-11 16:23 ` Andreas Gruenbacher
2019-06-12 1:07 ` Kefeng Wang
@ 2019-06-12 1:17 ` Kefeng Wang
1 sibling, 0 replies; 4+ messages in thread
From: Kefeng Wang @ 2019-06-12 1:17 UTC (permalink / raw)
To: cluster-devel.redhat.com
Use IS_ERR_OR_NULL where appropriate.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/gfs2/dir.c | 4 ++--
fs/gfs2/glock.c | 2 +-
fs/gfs2/inode.c | 2 +-
fs/gfs2/ops_fstype.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 88e4f955c518..6f35d19eec25 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -750,7 +750,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));
@@ -854,7 +854,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode,
return ERR_PTR(error);
dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, scan, name, NULL);
got_dent:
- if (unlikely(dent == NULL || IS_ERR(dent))) {
+ if (IS_ERR_OR_NULL(dent)) {
brelse(bh);
bh = NULL;
}
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index f1ebcb42cbf5..44718098cc60 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -681,7 +681,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 b296c59832a7..2e2a8a2fb51d 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -793,7 +793,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 08823bb3b2d0..9683d534e1a1 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -568,7 +568,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
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-12 1:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-05 14:24 [Cluster-devel] [PATCH] fs: gfs2: Use IS_ERR_OR_NULL Kefeng Wang
2019-06-11 16:23 ` Andreas Gruenbacher
2019-06-12 1:07 ` Kefeng Wang
2019-06-12 1:17 ` [Cluster-devel] [PATCH v2] " Kefeng Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).