lkml.org 
[lkml]   [2011]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH]: block: try-2 (modified): Initialize bi_rw in mpage so bio_add can make use of it.
From
> For this particular case, doing it when the bio is allocated makes more
> sense. That will avoid a similar error in there in the future.
>

Sounds good. Thanks. How about for other cases that alloc a new bio
and do bio_add_page() - like blkdev_issue_zeroout() and similar.
Should we add there too?


> Something ala the below.
>
> diff --git a/fs/mpage.c b/fs/mpage.c
> index fdfae9f..a2b8604 100644
> --- a/fs/mpage.c
> +++ b/fs/mpage.c
> @@ -80,7 +80,7 @@ static struct bio *mpage_bio_submit(int rw, struct bio *bio)
>
>  static struct bio *
>  mpage_alloc(struct block_device *bdev,
> -               sector_t first_sector, int nr_vecs,
> +               sector_t first_sector, int nr_vecs, int rw,
>                gfp_t gfp_flags)
>  {
>        struct bio *bio;
> @@ -93,8 +93,9 @@ mpage_alloc(struct block_device *bdev,
>        }
>
>        if (bio) {
> -               bio->bi_bdev = bdev;
>                bio->bi_sector = first_sector;
> +               bio->bi_bdev = bdev;
> +               bio->bi_rw = rw;
>        }
>        return bio;
>  }
> @@ -288,7 +289,7 @@ alloc_new:
>        if (bio == NULL) {
>                bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
>                                min_t(int, nr_pages, bio_get_nr_vecs(bdev)),
> -                               GFP_KERNEL);
> +                               READ, GFP_KERNEL);
>                if (bio == NULL)
>                        goto confused;
>        }
> @@ -580,7 +581,8 @@ page_is_mapped:
>  alloc_new:
>        if (bio == NULL) {
>                bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
> -                               bio_get_nr_vecs(bdev), GFP_NOFS|__GFP_HIGH);
> +                               bio_get_nr_vecs(bdev), WRITE,
> +                               GFP_NOFS|__GFP_HIGH);
>                if (bio == NULL)
>                        goto confused;
>        }
>
> --
> Jens Axboe
>
>
--
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/

\
 
 \ /
  Last update: 2011-07-11 19:55    [W:0.400 / U:1.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site