X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fblk-cgroup.c;h=e8918ffaf96d4a0a2dacf75838b5d8a89e5e8ca3;hb=bcc567e3115055a9cc256183d72864f01286be22;hp=b2b9837f9dd3475be841d41ed52dd7715e936d4b;hpb=7790ff45be89b6a3ed98bb8c0572255ad4ed7a28;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index b2b9837f9dd3..e8918ffaf96d 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -972,10 +972,10 @@ int blkcg_activate_policy(struct request_queue *q,
 	if (!new_blkg)
 		return -ENOMEM;
 
-	preloaded = !radix_tree_preload(GFP_KERNEL);
-
 	blk_queue_bypass_start(q);
 
+	preloaded = !radix_tree_preload(GFP_KERNEL);
+
 	/*
 	 * Make sure the root blkg exists and count the existing blkgs.  As
 	 * @q is bypassing at this point, blkg_lookup_create() can't be