projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
[cascardo/linux.git]
/
block
/
blk-ioc.c
diff --git
a/block/blk-ioc.c
b/block/blk-ioc.c
index
1a27f45
..
381cb50
100644
(file)
--- a/
block/blk-ioc.c
+++ b/
block/blk-ioc.c
@@
-289,7
+289,7
@@
struct io_context *get_task_io_context(struct task_struct *task,
{
struct io_context *ioc;
- might_sleep_if(gfp
_flags & __GFP_WAIT
);
+ might_sleep_if(gfp
flags_allow_blocking(gfp_flags)
);
do {
task_lock(task);