Re: linux-next: manual merge of the akpm-current tree with the block tree

[Stephen Rothwell]

Hi Andrew,

On Mon, 7 Dec 2015 11:44:31 -0800 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Mon, 7 Dec 2015 19:12:39 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> > --- a/fs/block_dev.c
> > +++ b/fs/block_dev.c
> > @@@ -432,7 -432,7 +432,7 @@@ int bdev_write_page(struct block_devic
> >   
> >   	if (!ops->rw_page || bdev_get_integrity(bdev))
> >   		return -EOPNOTSUPP;
> > - 	result = blk_queue_enter(bdev->bd_queue, false);
> >  -	result = blk_queue_enter(bdev->bd_queue, GFP_NOIO);
> > ++	result = blk_queue_enter(bdev->bd_queue, true);
> >   	if (result)  
> 
> We want nowait==false here.

OK, I will fix that up today.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/