Skip to content

Commit

Permalink
Revert "block: introduce bio_copy_data_partial"
Browse files Browse the repository at this point in the history
This reverts commit 6f88028.
bio_copy_data_partial() is no longer needed.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
  • Loading branch information
NeilBrown authored and Shaohua Li committed Apr 11, 2017
1 parent cb83efc commit 5051262
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 49 deletions.
60 changes: 13 additions & 47 deletions block/bio.c
Original file line number Diff line number Diff line change
Expand Up @@ -990,8 +990,19 @@ int bio_alloc_pages(struct bio *bio, gfp_t gfp_mask)
}
EXPORT_SYMBOL(bio_alloc_pages);

static void __bio_copy_data(struct bio *dst, struct bio *src,
int offset, int size)
/**
* bio_copy_data - copy contents of data buffers from one chain of bios to
* another
* @src: source bio list
* @dst: destination bio list
*
* If @src and @dst are single bios, bi_next must be NULL - otherwise, treats
* @src and @dst as linked lists of bios.
*
* Stops when it reaches the end of either @src or @dst - that is, copies
* min(src->bi_size, dst->bi_size) bytes (or the equivalent for lists of bios).
*/
void bio_copy_data(struct bio *dst, struct bio *src)
{
struct bvec_iter src_iter, dst_iter;
struct bio_vec src_bv, dst_bv;
Expand All @@ -1001,12 +1012,6 @@ static void __bio_copy_data(struct bio *dst, struct bio *src,
src_iter = src->bi_iter;
dst_iter = dst->bi_iter;

/* for supporting partial copy */
if (offset || size != src->bi_iter.bi_size) {
bio_advance_iter(src, &src_iter, offset);
src_iter.bi_size = size;
}

while (1) {
if (!src_iter.bi_size) {
src = src->bi_next;
Expand Down Expand Up @@ -1043,47 +1048,8 @@ static void __bio_copy_data(struct bio *dst, struct bio *src,
bio_advance_iter(dst, &dst_iter, bytes);
}
}

/**
* bio_copy_data - copy contents of data buffers from one chain of bios to
* another
* @src: source bio list
* @dst: destination bio list
*
* If @src and @dst are single bios, bi_next must be NULL - otherwise, treats
* @src and @dst as linked lists of bios.
*
* Stops when it reaches the end of either @src or @dst - that is, copies
* min(src->bi_size, dst->bi_size) bytes (or the equivalent for lists of bios).
*/
void bio_copy_data(struct bio *dst, struct bio *src)
{
__bio_copy_data(dst, src, 0, src->bi_iter.bi_size);
}
EXPORT_SYMBOL(bio_copy_data);

/**
* bio_copy_data_partial - copy partial contents of data buffers from one
* chain of bios to another
* @dst: destination bio list
* @src: source bio list
* @offset: starting copy from the offset
* @size: how many bytes to copy
*
* If @src and @dst are single bios, bi_next must be NULL - otherwise, treats
* @src and @dst as linked lists of bios.
*
* Stops when it reaches the end of either @src or @dst - that is, copies
* min(src->bi_size, dst->bi_size) bytes (or the equivalent for lists of bios).
*/
void bio_copy_data_partial(struct bio *dst, struct bio *src,
int offset, int size)
{
__bio_copy_data(dst, src, offset, size);

}
EXPORT_SYMBOL(bio_copy_data_partial);

struct bio_map_data {
int is_our_pages;
struct iov_iter iter;
Expand Down
2 changes: 0 additions & 2 deletions include/linux/bio.h
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,6 @@ static inline void bio_flush_dcache_pages(struct bio *bi)
#endif

extern void bio_copy_data(struct bio *dst, struct bio *src);
extern void bio_copy_data_partial(struct bio *dst, struct bio *src,
int offset, int size);
extern int bio_alloc_pages(struct bio *bio, gfp_t gfp);
extern void bio_free_pages(struct bio *bio);

Expand Down

0 comments on commit 5051262

Please sign in to comment.