projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
drivers
/
block
/
osdblk.c
diff --git
a/drivers/block/osdblk.c
b/drivers/block/osdblk.c
index
e229425
..
1b709a4
100644
(file)
--- a/
drivers/block/osdblk.c
+++ b/
drivers/block/osdblk.c
@@
-271,7
+271,7
@@
static struct bio *bio_chain_clone(struct bio *old_chain, gfp_t gfpmask)
goto err_out;
tmp->bi_bdev = NULL;
- gfpmask &= ~__GFP_
WAIT
;
+ gfpmask &= ~__GFP_
DIRECT_RECLAIM
;
tmp->bi_next = NULL;
if (!new_chain)