diff options
| author | Kefeng Wang <wangkefeng.wang@huawei.com> | 2019-06-05 22:24:27 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-06-05 08:22:24 -0600 |
| commit | 98d669b49120bad6a09c361daa71c92e6a9f8fbb (patch) | |
| tree | 95bdf54f76b0677fd67a021f5bef56e728266cec /block | |
| parent | e0241fb0b94399bb4131da7f29dc92cf5dc1ae71 (diff) | |
| download | linux-98d669b49120bad6a09c361daa71c92e6a9f8fbb.tar.bz2 | |
block: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag,
so no need to do that again from its callers. Drop it.
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index b97b479e4f64..1f7127b03490 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -881,7 +881,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; } |