projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-ioc.c
diff --git
a/block/blk-ioc.c
b/block/blk-ioc.c
index 4464c823cff2a0f3228a2dd5d54da3c9cdcbbde4..46cd7bd18b347c580bfee1f4b86fb59321070e56 100644
(file)
--- a/
block/blk-ioc.c
+++ b/
block/blk-ioc.c
@@
-367,7
+367,7
@@
struct io_cq *ioc_create_icq(struct io_context *ioc, struct request_queue *q,
if (!icq)
return NULL;
- if (radix_tree_preload(gfp_mask) < 0) {
+ if (radix_tree_
maybe_
preload(gfp_mask) < 0) {
kmem_cache_free(et->icq_cache, icq);
return NULL;
}