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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20151102085112.0505410a@canb.auug.org.au>
Date:	Mon, 2 Nov 2015 08:51:12 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mel Gorman <mgorman@...hsingularity.net>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Jens Axboe <axboe@...nel.dk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Dan Williams <dan.j.williams@...el.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 block tree

Hi Mel,

On Sun, 1 Nov 2015 18:38:53 +0000 Mel Gorman <mgorman@...hsingularity.net> wrote:
>
> On Mon, Nov 02, 2015 at 02:51:25AM +1100, Stephen Rothwell wrote:
> > 
> > @@ -2038,7 +2038,7 @@ void generic_make_request(struct bio *bio)
> >  	do {
> >  		struct request_queue *q = bdev_get_queue(bio->bi_bdev);
> >  
> > -		if (likely(blk_queue_enter(q, __GFP_WAIT) == 0)) {
> > +		if (likely(blk_queue_enter(q, __GFP_RECLAIM) == 0)) {
> >  
> >  			q->make_request_fn(q, bio);
> 
> ___GFP_DIRECT_RECLAIM is more appropriate than __GFP_RECLAIM in the
> second hunk.

OK, I have done that for today, thanks.

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