浏览代码

blkcg: make blkcg_activate_policy() allow NULL ->pd_init_fn

blkg_create() allows NULL ->pd_init_fn() but blkcg_activate_policy()
doesn't.  As both in-kernel policies implement ->pd_init_fn, it
currently doesn't break anything.  Update blkcg_activate_policy() so
that its behavior is consistent with blkg_create().

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Tejun Heo 10 年之前
父节点
当前提交
3e41871046
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      block/blk-cgroup.c

+ 2 - 1
block/blk-cgroup.c

@@ -1083,7 +1083,8 @@ pd_prealloc:
 		blkg->pd[pol->plid] = pd;
 		blkg->pd[pol->plid] = pd;
 		pd->blkg = blkg;
 		pd->blkg = blkg;
 		pd->plid = pol->plid;
 		pd->plid = pol->plid;
-		pol->pd_init_fn(blkg);
+		if (pol->pd_init_fn)
+			pol->pd_init_fn(blkg);
 	}
 	}
 
 
 	__set_bit(pol->plid, q->blkcg_pols);
 	__set_bit(pol->plid, q->blkcg_pols);