Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1b353f0 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: use GFP_NOIO for bio_alloc instead of GFP_NOWAIT 



Alberto Bertogli advised me about bio_alloc() use in nilfs:
On Sat, 13 Jun 2009 22:52:40 -0300, Alberto Bertogli wrote:
> By the way, those bio_alloc()s are using GFP_NOWAIT but it looks
> like they could use at least GFP_NOIO or GFP_NOFS, since the caller
> can (and sometimes do) sleep. The only caller is nilfs_submit_bh(),
> which calls nilfs_submit_seg_bio() which can sleep calling
> wait_for_completion().

This takes in the comment and replaces the use of GFP_NOWAIT flag with
GFP_NOIO.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 1dfa2710

fs/nilfs2/segbuf.c

+2 −2
Original line number Diff line number Diff line
@@ -316,10 +316,10 @@ static struct bio *nilfs_alloc_seg_bio(struct super_block *sb, sector_t start, 
{

	struct bio *bio;



	bio = bio_alloc(GFP_NOWAIT, nr_vecs);

	bio = bio_alloc(GFP_NOIO, nr_vecs);

	if (bio == NULL) {

		while (!bio && (nr_vecs >>= 1))

			bio = bio_alloc(GFP_NOWAIT, nr_vecs);

			bio = bio_alloc(GFP_NOIO, nr_vecs);

	}

	if (likely(bio)) {

		bio->bi_bdev = sb->s_bdev;