Message ID | 20190212031657.14324-1-cgxu519@gmx.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | block: remove redundant unlikely annotation | expand |
On Tue, 2019-02-12 at 11:16 +0800, Chengguang Xu wrote: > unlikely has already included in IS_ERR(), > so just remove it. > > Signed-off-by: Chengguang Xu <cgxu519@gmx.com> > --- > block/blk-cgroup.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > index 2bed5725aa03..699dba716c83 100644 > --- a/block/blk-cgroup.c > +++ b/block/blk-cgroup.c > @@ -880,7 +880,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, > blkg_free(new_blkg); > } else { > blkg = blkg_create(pos, q, new_blkg); > - if (unlikely(IS_ERR(blkg))) { > + if (IS_ERR(blkg)) { > ret = PTR_ERR(blkg); > goto fail_unlock; > } Reviewed-by: Bart Van Assche <bvanassche@acm.org>
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 2bed5725aa03..699dba716c83 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -880,7 +880,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, blkg_free(new_blkg); } else { blkg = blkg_create(pos, q, new_blkg); - if (unlikely(IS_ERR(blkg))) { + if (IS_ERR(blkg)) { ret = PTR_ERR(blkg); goto fail_unlock; }
unlikely has already included in IS_ERR(), so just remove it. Signed-off-by: Chengguang Xu <cgxu519@gmx.com> --- block/blk-cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)