Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.10/core

This contains Kents prep work for the immutable bio_vecs.

3 files changed, 16 insertions, 75 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 441f3488a766..f224d1793ee5 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -159,20 +159,10 @@ static void req_bio_endio(struct request *rq, struct bio *bio,
         else if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
                 error = -EIO;
 
-        if (unlikely(nbytes > bio->bi_size)) {
-                printk(KERN_ERR "%s: want %u bytes done, %u left\n",
-                       __func__, nbytes, bio->bi_size);
-                nbytes = bio->bi_size;
-        }
-
         if (unlikely(rq->cmd_flags & REQ_QUIET))
                 set_bit(BIO_QUIET, &bio->bi_flags);
 
-        bio->bi_size -= nbytes;
-        bio->bi_sector += (nbytes >> 9);
-
-        if (bio_integrity(bio))
-                bio_integrity_advance(bio, nbytes);
+        bio_advance(bio, nbytes);
 
         /* don't actually finish bio if it's part of flush sequence */
         if (bio->bi_size == 0 && !(rq->cmd_flags & REQ_FLUSH_SEQ))
@@ -1609,7 +1599,7 @@ static void handle_bad_sector(struct bio *bio)
         printk(KERN_INFO "%s: rw=%ld, want=%Lu, limit=%Lu\n",
                         bdevname(bio->bi_bdev, b),
                         bio->bi_rw,
-                        (unsigned long long)bio->bi_sector + bio_sectors(bio),
+                        (unsigned long long)bio_end_sector(bio),
                         (long long)(i_size_read(bio->bi_bdev->bd_inode) >> 9));
 
         set_bit(BIO_EOF, &bio->bi_flags);
@@ -2292,8 +2282,7 @@ EXPORT_SYMBOL(blk_fetch_request);
  **/
 bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
 {
-        int total_bytes, bio_nbytes, next_idx = 0;
-        struct bio *bio;
+        int total_bytes;
 
         if (!req->bio)
                 return false;
@@ -2339,56 +2328,21 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
 
         blk_account_io_completion(req, nr_bytes);
 
-        total_bytes = bio_nbytes = 0;
-        while ((bio = req->bio) != NULL) {
-                int nbytes;
+        total_bytes = 0;
+        while (req->bio) {
+                struct bio *bio = req->bio;
+                unsigned bio_bytes = min(bio->bi_size, nr_bytes);
 
-                if (nr_bytes >= bio->bi_size) {
+                if (bio_bytes == bio->bi_size)
                         req->bio = bio->bi_next;
-                        nbytes = bio->bi_size;
-                        req_bio_endio(req, bio, nbytes, error);
-                        next_idx = 0;
-                        bio_nbytes = 0;
-                } else {
-                        int idx = bio->bi_idx + next_idx;
-
-                        if (unlikely(idx >= bio->bi_vcnt)) {
-                                blk_dump_rq_flags(req, "__end_that");
-                                printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
-                                       __func__, idx, bio->bi_vcnt);
-                                break;
-                        }
-
-                        nbytes = bio_iovec_idx(bio, idx)->bv_len;
-                        BIO_BUG_ON(nbytes > bio->bi_size);
-
-                        /*
-                         * not a complete bvec done
-                         */
-                        if (unlikely(nbytes > nr_bytes)) {
-                                bio_nbytes += nr_bytes;
-                                total_bytes += nr_bytes;
-                                break;
-                        }
 
-                        /*
-                         * advance to the next vector
-                         */
-                        next_idx++;
-                        bio_nbytes += nbytes;
-                }
+                req_bio_endio(req, bio, bio_bytes, error);
 
-                total_bytes += nbytes;
-                nr_bytes -= nbytes;
+                total_bytes += bio_bytes;
+                nr_bytes -= bio_bytes;
 
-                bio = req->bio;
-                if (bio) {
-                        /*
-                         * end more in this run, or just return 'not-done'
-                         */
-                        if (unlikely(nr_bytes <= 0))
-                                break;
-                }
+                if (!nr_bytes)
+                        break;
         }
 
         /*
@@ -2404,16 +2358,6 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
                 return false;
         }
 
-        /*
-         * if the request wasn't completed, update state
-         */
-        if (bio_nbytes) {
-                req_bio_endio(req, bio, bio_nbytes, error);
-                bio->bi_idx += next_idx;
-                bio_iovec(bio)->bv_offset += nr_bytes;
-                bio_iovec(bio)->bv_len -= nr_bytes;
-        }
-
         req->__data_len -= total_bytes;
         req->buffer = bio_data(req->bio);
 
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 4f0ade74cfd0..d5cd3131c57a 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2270,11 +2270,8 @@ cfq_find_rq_fmerge(struct cfq_data *cfqd, struct bio *bio)
                 return NULL;
 
         cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio));
-        if (cfqq) {
-                sector_t sector = bio->bi_sector + bio_sectors(bio);
-
-                return elv_rb_find(&cfqq->sort_list, sector);
-        }
+        if (cfqq)
+                return elv_rb_find(&cfqq->sort_list, bio_end_sector(bio));
 
         return NULL;
 }
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index 90037b5eb17f..ba19a3afab79 100644
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -132,7 +132,7 @@ deadline_merge(struct request_queue *q, struct request **req, struct bio *bio)
          * check for front merge
          */
         if (dd->front_merges) {
-                sector_t sector = bio->bi_sector + bio_sectors(bio);
+                sector_t sector = bio_end_sector(bio);
 
                 __rq = elv_rb_find(&dd->sort_list[bio_data_dir(bio)], sector);
                 if (__rq) {