blkcg: remove unnecessary request_list->blkg NULL test in blk_put_rl()

htejun · axboe · commit 401efbf83504 · 2015-08-18T15:49:16.000-07:00
Since ec13b1d ("blkcg: always create the blkcg_gq for the root blkcg"), a request_list always has its blkg associated. Drop unnecessary rl->blkg NULL test from blk_put_rl(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
@@ -394,8 +394,7 @@ static inline struct request_list *blk_get_rl(struct request_queue *q,
  */
 static inline void blk_put_rl(struct request_list *rl)
 {
-	/* root_rl may not have blkg set */
-	if (rl->blkg && rl->blkg->blkcg != &blkcg_root)
+	if (rl->blkg->blkcg != &blkcg_root)
 		blkg_put(rl->blkg);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -394,8 +394,7 @@ static inline struct request_list blk_get_rl(struct request_queue q,`
`394`	`394`	`*/`
`395`	`395`	`static inline void blk_put_rl(struct request_list *rl)`
`396`	`396`	`{`
`397`		`- /* root_rl may not have blkg set */`
`398`		`- if (rl->blkg && rl->blkg->blkcg != &blkcg_root)`
	`397`	`+ if (rl->blkg->blkcg != &blkcg_root)`
`399`	`398`	`blkg_put(rl->blkg);`
`400`	`399`	`}`
`401`	`400`