blk-cgroup: Drop unlikely before IS_ERR(_OR_NULL)
authorViresh Kumar <viresh.kumar@linaro.org>
Wed, 12 Aug 2015 10:29:45 +0000 (15:59 +0530)
committerJens Axboe <axboe@fb.com>
Thu, 13 Aug 2015 16:45:09 +0000 (10:45 -0600)
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>
include/linux/blk-cgroup.h

index 1b62d768c7df5ea3053d09ed3878d1d7a16837b2..a4cd1641e9e2d74ccfd8518d415318401e5a4da8 100644 (file)
@@ -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);