On Tue, 2019-02-12 at 11:16 +-0800, Chengguang Xu wrote: +AD4 unlikely has already included in IS+AF8-ERR(), +AD4 so just remove it. +AD4 +AD4 Signed-off-by: Chengguang Xu +ADw-cgxu519+AEA-gmx.com+AD4 +AD4 --- +AD4 block/blk-cgroup.c +AHw 2 +-- +AD4 1 file changed, 1 insertion(+-), 1 deletion(-) +AD4 +AD4 diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c +AD4 index 2bed5725aa03..699dba716c83 100644 +AD4 --- a/block/blk-cgroup.c +AD4 +-+-+- b/block/blk-cgroup.c +AD4 +AEAAQA -880,7 +-880,7 +AEAAQA int blkg+AF8-conf+AF8-prep(struct blkcg +ACo-blkcg, const struct blkcg+AF8-policy +ACo-pol, +AD4 blkg+AF8-free(new+AF8-blkg)+ADs +AD4 +AH0 else +AHs +AD4 blkg +AD0 blkg+AF8-create(pos, q, new+AF8-blkg)+ADs +AD4 - if (unlikely(IS+AF8-ERR(blkg))) +AHs +AD4 +- if (IS+AF8-ERR(blkg)) +AHs +AD4 ret +AD0 PTR+AF8-ERR(blkg)+ADs +AD4 goto fail+AF8-unlock+ADs +AD4 +AH0 Reviewed-by: Bart Van Assche +ADw-bvanassche+AEA-acm.org+AD4
