OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block
[uclinux-h8/linux.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index
60912e9
..
2eb722d
100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-1888,8
+1888,8
@@
generic_make_request_checks(struct bio *bio)
*/
create_io_context(GFP_ATOMIC, q->node);
- if (
blk_throtl_bio
(q, bio))
- return false;
/* throttled, will be resubmitted later */
+ if (
!blkcg_bio_issue_check
(q, bio))
+ return false;
trace_block_bio_queue(q, bio);
return true;