summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2015-08-12 13:29:45 +0300
committerJens Axboe <axboe@fb.com>2015-08-13 19:45:09 +0300
commit41609892701e26724b8617201f43254cadf2e7ae (patch)
tree7ed1ce922a017856ff2f2e0ca8abc4940ea7a066
parent9b81c842355ac96097ba32ad5632e9ef0ff59f92 (diff)
downloadlinux-41609892701e26724b8617201f43254cadf2e7ae.tar.xz
blk-cgroup: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it. Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--include/linux/blk-cgroup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index 1b62d768c7df..a4cd1641e9e2 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -374,7 +374,7 @@ static inline struct request_list *blk_get_rl(struct request_queue *q,
* root_rl in such cases.
*/
blkg = blkg_lookup_create(blkcg, q);
- if (unlikely(IS_ERR(blkg)))
+ if (IS_ERR(blkg))
goto root_rl;
blkg_get(blkg);