block: reorganize throtl_get_tg() and blk_throtl_bio()

[mirror_ubuntu-artful-kernel.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 149149dd7f7b0185e09ed21b6333d52a6803e6f3..6c491f2388e9ed9230a8f6be1d07b235d8eddf86 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1515,12 +1515,8 @@ generic_make_request_checks(struct bio *bio)
                goto end_io;
        }
 
-       if (blk_throtl_bio(q, &bio))
-               goto end_io;
-
-       /* if bio = NULL, bio has been throttled and will be submitted later. */
-       if (!bio)
-               return false;
+       if (blk_throtl_bio(q, bio))
+               return false;   /* throttled, will be resubmitted later */
 
        trace_block_bio_queue(q, bio);
        return true;