diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-13 16:40:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-13 16:40:01 +1100 |
| commit | be9414f2ff2406778cb5a55466822c5594df90bf (patch) | |
| tree | d86264aafc5d3a598b56985f2b04303ee402f109 /drivers/block/osdblk.c | |
| parent | b3d8dd33d9c63535d162d828fdce9c045cd8ed88 (diff) | |
| parent | c3a0c7301db7c3797655cf114e67f4162830c370 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'drivers/block/osdblk.c')
| -rw-r--r-- | drivers/block/osdblk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c index e22942596207..1b709a4e3b5e 100644 --- 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) |