From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932851AbbLGToe (ORCPT <rfc822;w@1wt.eu>);
	Mon, 7 Dec 2015 14:44:34 -0500
Received: from mail.linuxfoundation.org ([140.211.169.12]:35278 "EHLO
	mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932519AbbLGToc (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 7 Dec 2015 14:44:32 -0500
Date: Mon, 7 Dec 2015 11:44:31 -0800
From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 block tree
Message-Id: <20151207114431.5a5b50b54da49cbe6ab6ca67@linux-foundation.org>
In-Reply-To: <20151207191239.3c1a1c01@canb.auug.org.au>
References: <20151207191239.3c1a1c01@canb.auug.org.au>
X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 7 Dec 2015 19:12:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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.