As multipage bvec will be enabled soon, bio->bi_vcnt isn't same with
page count in the bio any more, so use bio_for_each_page_all() to
compute the number.

Signed-off-by: Ming Lei <ming....@redhat.com>
---
 include/linux/bio.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 0cb29c73ff27..2dd1ca0285e1 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -330,8 +330,14 @@ static inline void bio_get_last_bvec(struct bio *bio, 
struct bio_vec *bv)
 
 static inline unsigned bio_pages_all(struct bio *bio)
 {
+       unsigned i;
+       struct bio_vec *bv;
+
        WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));
-       return bio->bi_vcnt;
+
+       bio_for_each_page_all(bv, bio, i)
+               ;
+       return i;
 }
 
 static inline struct bio_vec *bio_first_bvec_all(struct bio *bio)
-- 
2.9.5

Reply via email to