Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1285074 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the akpm-current tree with the block  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-07 09:20 +0100
    Re: linux-next: manual merge of the akpm-current tree with the  block tree Andrew Morton <akpm@linux-foundation.org> - 2015-12-07 20:50 +0100
      Re: linux-next: manual merge of the akpm-current tree with the  block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-07 21:30 +0100

#1285074 — linux-next: manual merge of the akpm-current tree with the block tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  fs/block_dev.c

between commit:

  6f3b0e8bcf3c ("blk-mq: add a flags parameter to blk_mq_alloc_request")

from the block tree and commit:

  f39b774555f0 ("fs/block_dev.c:bdev_write_page(): use blk_queue_enter(..., GFP_NOIO)")

from the akpm-current tree.

I fixed it up (see below, though I am not sure it is the correct fix?) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/block_dev.c
index aa1a45985889,c27362de0039..000000000000
--- 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)
  		return result;
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

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

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

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

Hi Andrew,

On Mon, 7 Dec 2015 11:44:31 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> 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.

OK, I will fix that up today.

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web