Re: [PATCH 2/9] btrfs: don't access the bio directly in the raid5/6 code

[Omar Sandoval]

On Wed, Nov 16, 2016 at 01:52:09PM +0100, Christoph Hellwig wrote:
> Just use bio_for_each_segment_all to iterate over all segments.
> 

Besides the minor whitespace issue below,

Reviewed-by: Omar Sandoval 

> Signed-off-by: Christoph Hellwig 
> ---
>  fs/btrfs/raid56.c | 16 ++--
>  1 file changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
> index d016d4a..da941fb 100644
> --- a/fs/btrfs/raid56.c
> +++ b/fs/btrfs/raid56.c
> @@ -1144,10 +1144,10 @@ static void validate_rbio_for_rmw(struct 
> btrfs_raid_bio *rbio)
>  static void index_rbio_pages(struct btrfs_raid_bio *rbio)
>  {
>   struct bio *bio;
> + struct bio_vec *bvec;
>   u64 start;
>   unsigned long stripe_offset;
>   unsigned long page_index;
> - struct page *p;
>   int i;
>  
>   spin_lock_irq(>bio_list_lock);
> @@ -1156,10 +1156,8 @@ static void index_rbio_pages(struct btrfs_raid_bio 
> *rbio)
>   stripe_offset = start - rbio->bbio->raid_map[0];
>   page_index = stripe_offset >> PAGE_SHIFT;
>  
> - for (i = 0; i < bio->bi_vcnt; i++) {
> - p = bio->bi_io_vec[i].bv_page;
> - rbio->bio_pages[page_index + i] = p;
> - }
> + bio_for_each_segment_all(bvec, bio, i)
> + rbio->bio_pages[page_index+ i] = bvec->bv_page;

Missing a space right here --^

>   }
>   spin_unlock_irq(>bio_list_lock);
>  }
> @@ -1433,13 +1431,11 @@ static int fail_bio_stripe(struct btrfs_raid_bio 
> *rbio,
>   */
>  static void set_bio_pages_uptodate(struct bio *bio)
>  {
> + struct bio_vec *bvec;
>   int i;
> - struct page *p;
>  
> - for (i = 0; i < bio->bi_vcnt; i++) {
> - p = bio->bi_io_vec[i].bv_page;
> - SetPageUptodate(p);
> - }
> + bio_for_each_segment_all(bvec, bio, i)
> + SetPageUptodate(bvec->bv_page);
>  }
>  
>  /*
> -- 
> 2.1.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Omar
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/9] btrfs: don't access the bio directly in the raid5/6 code

[Christoph Hellwig]

Just use bio_for_each_segment_all to iterate over all segments.

Signed-off-by: Christoph Hellwig 
---
 fs/btrfs/raid56.c | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index d016d4a..da941fb 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1144,10 +1144,10 @@ static void validate_rbio_for_rmw(struct btrfs_raid_bio 
*rbio)
 static void index_rbio_pages(struct btrfs_raid_bio *rbio)
 {
struct bio *bio;
+   struct bio_vec *bvec;
u64 start;
unsigned long stripe_offset;
unsigned long page_index;
-   struct page *p;
int i;
 
spin_lock_irq(>bio_list_lock);
@@ -1156,10 +1156,8 @@ static void index_rbio_pages(struct btrfs_raid_bio *rbio)
stripe_offset = start - rbio->bbio->raid_map[0];
page_index = stripe_offset >> PAGE_SHIFT;
 
-   for (i = 0; i < bio->bi_vcnt; i++) {
-   p = bio->bi_io_vec[i].bv_page;
-   rbio->bio_pages[page_index + i] = p;
-   }
+   bio_for_each_segment_all(bvec, bio, i)
+   rbio->bio_pages[page_index+ i] = bvec->bv_page;
}
spin_unlock_irq(>bio_list_lock);
 }
@@ -1433,13 +1431,11 @@ static int fail_bio_stripe(struct btrfs_raid_bio *rbio,
  */
 static void set_bio_pages_uptodate(struct bio *bio)
 {
+   struct bio_vec *bvec;
int i;
-   struct page *p;
 
-   for (i = 0; i < bio->bi_vcnt; i++) {
-   p = bio->bi_io_vec[i].bv_page;
-   SetPageUptodate(p);
-   }
+   bio_for_each_segment_all(bvec, bio, i)
+   SetPageUptodate(bvec->bv_page);
 }
 
 /*
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html