]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
blkcg: remove unnecessary request_list->blkg NULL test in blk_put_rl()
authorTejun Heo <tj@kernel.org>
Tue, 18 Aug 2015 21:55:06 +0000 (14:55 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 18 Aug 2015 22:49:16 +0000 (15:49 -0700)
Since ec13b1d6f0a0 ("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>
include/linux/blk-cgroup.h

index 1b62d768c7df5ea3053d09ed3878d1d7a16837b2..9711fc277c02d2e9a9baaa81833eec5db3d53a5e 100644 (file)
@@ -394,8 +394,7 @@ root_rl:
  */
 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);
 }