Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / include / linux / bio.h

diff --git a/include/linux/bio.h b/include/linux/bio.h
index a0b4cfd..2203b68 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -44,9 +44,6 @@ static inline unsigned int bio_max_segs(unsigned int nr_segs)
 #define bio_offset(bio)                bio_iter_offset((bio), (bio)->bi_iter)
 #define bio_iovec(bio)         bio_iter_iovec((bio), (bio)->bi_iter)
 
-#define bio_multiple_segments(bio)                             \
-       ((bio)->bi_iter.bi_size != bio_iovec(bio).bv_len)
-
 #define bvec_iter_sectors(iter)        ((iter).bi_size >> 9)
 #define bvec_iter_end_sector(iter) ((iter).bi_sector + bvec_iter_sectors((iter)))
 
@@ -271,7 +268,7 @@ static inline void bio_clear_flag(struct bio *bio, unsigned int bit)
 
 static inline void bio_get_first_bvec(struct bio *bio, struct bio_vec *bv)
 {
-       *bv = bio_iovec(bio);
+       *bv = mp_bvec_iter_bvec(bio->bi_io_vec, bio->bi_iter);
 }
 
 static inline void bio_get_last_bvec(struct bio *bio, struct bio_vec *bv)
@@ -279,10 +276,9 @@ static inline void bio_get_last_bvec(struct bio *bio, struct bio_vec *bv)
        struct bvec_iter iter = bio->bi_iter;
        int idx;
 
-       if (unlikely(!bio_multiple_segments(bio))) {
-               *bv = bio_iovec(bio);
-               return;
-       }
+       bio_get_first_bvec(bio, bv);
+       if (bv->bv_len == bio->bi_iter.bi_size)
+               return;         /* this bio only has a single bvec */
 
        bio_advance_iter(bio, &iter, iter.bi_size);
 
@@ -822,4 +818,6 @@ static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb)
                bio->bi_opf |= REQ_NOWAIT;
 }
 
+struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp);
+
 #endif /* __LINUX_BIO_H */