[PATCH] loop 4/9 copy bio not data

• Next message: Hugh Dickins: "[PATCH] loop 5/9 remove an IV"
• Previous message: Hugh Dickins: "[PATCH] loop 3/9 loop bio renaming"
• In reply to: Hugh Dickins: "[PATCH] loop 1/9 file use highmem"
• Next in thread: Hugh Dickins: "[PATCH] loop 5/9 remove an IV"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Remove copy flag and code from loop_copy_bio: wasn't used when reading,
and waste of time when writing - the loop transfer function does that.
And don't initialize bio fields immediately reinitialized by caller.

--- loop3/drivers/block/loop.c Mon Jun 9 10:39:45 2003
+++ loop4/drivers/block/loop.c Mon Jun 9 10:44:49 2003
@@ -439,10 +439,9 @@
         return 0;
 }
 
-static struct bio *loop_copy_bio(struct bio *rbh, int gfp_mask, int copy)
+static struct bio *loop_copy_bio(struct bio *rbh, int gfp_mask)
 {
         struct bio *bio;
- unsigned long flags = 0; /* gcc silly */
         struct bio_vec *bv;
         int i;
 
@@ -451,11 +450,10 @@
                 return NULL;
 
         /*
- * iterate iovec list and alloc pages + copy data
+ * iterate iovec list and alloc pages
          */
         __bio_for_each_segment(bv, rbh, i, 0) {
                 struct bio_vec *bbv = &bio->bi_io_vec[i];
- char *vfrom, *vto;
 
                 bbv->bv_page = alloc_page(gfp_mask);
                 if (bbv->bv_page == NULL)
@@ -463,38 +461,8 @@
 
                 bbv->bv_len = bv->bv_len;
                 bbv->bv_offset = bv->bv_offset;
-
- /*
- * if doing a copy for a READ request, no need
- * to memcpy page data
- */
- if (!copy)
- continue;
-
- if (gfp_mask & __GFP_WAIT) {
- vfrom = kmap(bv->bv_page);
- vto = kmap(bbv->bv_page);
- } else {
- local_irq_save(flags);
- vfrom = kmap_atomic(bv->bv_page, KM_BIO_SRC_IRQ);
- vto = kmap_atomic(bbv->bv_page, KM_BIO_DST_IRQ);
- }
-
- memcpy(vto + bbv->bv_offset, vfrom + bv->bv_offset, bv->bv_len);
- if (gfp_mask & __GFP_WAIT) {
- kunmap(bbv->bv_page);
- kunmap(bv->bv_page);
- } else {
- kunmap_atomic(vto, KM_BIO_DST_IRQ);
- kunmap_atomic(vfrom, KM_BIO_SRC_IRQ);
- local_irq_restore(flags);
- }
         }
 
- bio->bi_sector = rbh->bi_sector;
- bio->bi_bdev = rbh->bi_bdev;
- bio->bi_rw = rbh->bi_rw;
-
         bio->bi_vcnt = rbh->bi_vcnt;
         bio->bi_size = rbh->bi_size;
 
@@ -531,8 +499,7 @@
 
                 current->flags &= ~PF_MEMALLOC;
                 bio = loop_copy_bio(rbh,
- (GFP_ATOMIC & ~__GFP_HIGH) | __GFP_NOWARN,
- rbh->bi_rw & WRITE);
+ (GFP_ATOMIC & ~__GFP_HIGH) | __GFP_NOWARN);
                 current->flags = flags;
                 if (bio == NULL)
                         blk_congestion_wait(WRITE, HZ/10);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

• Next message: Hugh Dickins: "[PATCH] loop 5/9 remove an IV"
• Previous message: Hugh Dickins: "[PATCH] loop 3/9 loop bio renaming"
• In reply to: Hugh Dickins: "[PATCH] loop 1/9 file use highmem"
• Next in thread: Hugh Dickins: "[PATCH] loop 5/9 remove an IV"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Sun Jun 15 2003 - 22:00:23 EST