selftests/seccomp: More closely track fds being assigned

[linux-2.6-microblaze.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 50e5790..44205df 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -493,20 +493,20 @@ struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned short nr_iovecs)
 }
 EXPORT_SYMBOL(bio_kmalloc);
 
-void zero_fill_bio_iter(struct bio *bio, struct bvec_iter start)
+void zero_fill_bio(struct bio *bio)
 {
        unsigned long flags;
        struct bio_vec bv;
        struct bvec_iter iter;
 
-       __bio_for_each_segment(bv, bio, iter, start) {
+       bio_for_each_segment(bv, bio, iter) {
                char *data = bvec_kmap_irq(&bv, &flags);
                memset(data, 0, bv.bv_len);
                flush_dcache_page(bv.bv_page);
                bvec_kunmap_irq(data, &flags);
        }
 }
-EXPORT_SYMBOL(zero_fill_bio_iter);
+EXPORT_SYMBOL(zero_fill_bio);
 
 /**
  * bio_truncate - truncate the bio to small size of @new_size
@@ -1236,43 +1236,6 @@ void bio_copy_data(struct bio *dst, struct bio *src)
 }
 EXPORT_SYMBOL(bio_copy_data);
 
-/**
- * bio_list_copy_data - copy contents of data buffers from one chain of bios to
- * another
- * @src: source bio list
- * @dst: destination bio list
- *
- * Stops when it reaches the end of either the @src list or @dst list - that is,
- * copies min(src->bi_size, dst->bi_size) bytes (or the equivalent for lists of
- * bios).
- */
-void bio_list_copy_data(struct bio *dst, struct bio *src)
-{
-       struct bvec_iter src_iter = src->bi_iter;
-       struct bvec_iter dst_iter = dst->bi_iter;
-
-       while (1) {
-               if (!src_iter.bi_size) {
-                       src = src->bi_next;
-                       if (!src)
-                               break;
-
-                       src_iter = src->bi_iter;
-               }
-
-               if (!dst_iter.bi_size) {
-                       dst = dst->bi_next;
-                       if (!dst)
-                               break;
-
-                       dst_iter = dst->bi_iter;
-               }
-
-               bio_copy_data_iter(dst, &dst_iter, src, &src_iter);
-       }
-}
-EXPORT_SYMBOL(bio_list_copy_data);
-
 void bio_free_pages(struct bio *bio)
 {
        struct bio_vec *bvec;