Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block

Pull block IO update from Jens Axboe:
 "Core block IO bits for 3.7.  Not a huge round this time, it contains:

   - First series from Kent cleaning up and generalizing bio allocation
     and freeing.

   - WRITE_SAME support from Martin.

   - Mikulas patches to prevent O_DIRECT crashes when someone changes
     the block size of a device.

   - Make bio_split() work on data-less bio's (like trim/discards).

   - A few other minor fixups."

Fixed up silent semantic mis-merge as per Mikulas Patocka and Andrew
Morton.  It is due to the VM no longer using a prio-tree (see commit
6b2dbba8b6ac: "mm: replace vma prio_tree with an interval tree").

So make set_blocksize() use mapping_mapped() instead of open-coding the
internal VM knowledge that has changed.

* 'for-3.7/core' of git://git.kernel.dk/linux-block: (26 commits)
  block: makes bio_split support bio without data
  scatterlist: refactor the sg_nents
  scatterlist: add sg_nents
  fs: fix include/percpu-rwsem.h export error
  percpu-rw-semaphore: fix documentation typos
  fs/block_dev.c:1644:5: sparse: symbol 'blkdev_mmap' was not declared
  blockdev: turn a rw semaphore into a percpu rw semaphore
  Fix a crash when block device is read and block size is changed at the same time
  block: fix request_queue->flags initialization
  block: lift the initial queue bypass mode on blk_register_queue() instead of blk_init_allocated_queue()
  block: ioctl to zero block ranges
  block: Make blkdev_issue_zeroout use WRITE SAME
  block: Implement support for WRITE SAME
  block: Consolidate command flag and queue limit checks for merges
  block: Clean up special command handling logic
  block/blk-tag.c: Remove useless kfree
  block: remove the duplicated setting for congestion_threshold
  block: reject invalid queue attribute values
  block: Add bio_clone_bioset(), bio_clone_kmalloc()
  block: Consolidate bio_alloc_bioset(), bio_kmalloc()
  ...

1 files changed, 7 insertions, 45 deletions

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index ba66e4445f41..2e7de7a59bfc 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -522,38 +522,6 @@ static void pkt_bio_finished(struct pktcdvd_device *pd)
         }
 }
 
-static void pkt_bio_destructor(struct bio *bio)
-{
-        kfree(bio->bi_io_vec);
-        kfree(bio);
-}
-
-static struct bio *pkt_bio_alloc(int nr_iovecs)
-{
-        struct bio_vec *bvl = NULL;
-        struct bio *bio;
-
-        bio = kmalloc(sizeof(struct bio), GFP_KERNEL);
-        if (!bio)
-                goto no_bio;
-        bio_init(bio);
-
-        bvl = kcalloc(nr_iovecs, sizeof(struct bio_vec), GFP_KERNEL);
-        if (!bvl)
-                goto no_bvl;
-
-        bio->bi_max_vecs = nr_iovecs;
-        bio->bi_io_vec = bvl;
-        bio->bi_destructor = pkt_bio_destructor;
-
-        return bio;
-
- no_bvl:
-        kfree(bio);
- no_bio:
-        return NULL;
-}
-
 /*
  * Allocate a packet_data struct
  */
@@ -567,7 +535,7 @@ static struct packet_data *pkt_alloc_packet_data(int frames)
                 goto no_pkt;
 
         pkt->frames = frames;
-        pkt->w_bio = pkt_bio_alloc(frames);
+        pkt->w_bio = bio_kmalloc(GFP_KERNEL, frames);
         if (!pkt->w_bio)
                 goto no_bio;
 
@@ -581,9 +549,10 @@ static struct packet_data *pkt_alloc_packet_data(int frames)
         bio_list_init(&pkt->orig_bios);
 
         for (i = 0; i < frames; i++) {
-                struct bio *bio = pkt_bio_alloc(1);
+                struct bio *bio = bio_kmalloc(GFP_KERNEL, 1);
                 if (!bio)
                         goto no_rd_bio;
+
                 pkt->r_bios[i] = bio;
         }
 
@@ -1111,21 +1080,17 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt)
          * Schedule reads for missing parts of the packet.
          */
         for (f = 0; f < pkt->frames; f++) {
-                struct bio_vec *vec;
-
                 int p, offset;
+
                 if (written[f])
                         continue;
+
                 bio = pkt->r_bios[f];
-                vec = bio->bi_io_vec;
-                bio_init(bio);
-                bio->bi_max_vecs = 1;
+                bio_reset(bio);
                 bio->bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9);
                 bio->bi_bdev = pd->bdev;
                 bio->bi_end_io = pkt_end_io_read;
                 bio->bi_private = pkt;
-                bio->bi_io_vec = vec;
-                bio->bi_destructor = pkt_bio_destructor;
 
                 p = (f * CD_FRAMESIZE) / PAGE_SIZE;
                 offset = (f * CD_FRAMESIZE) % PAGE_SIZE;
@@ -1418,14 +1383,11 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt)
         }
 
         /* Start the write request */
-        bio_init(pkt->w_bio);
-        pkt->w_bio->bi_max_vecs = PACKET_MAX_SIZE;
+        bio_reset(pkt->w_bio);
         pkt->w_bio->bi_sector = pkt->sector;
         pkt->w_bio->bi_bdev = pd->bdev;
         pkt->w_bio->bi_end_io = pkt_end_io_packet_write;
         pkt->w_bio->bi_private = pkt;
-        pkt->w_bio->bi_io_vec = bvec;
-        pkt->w_bio->bi_destructor = pkt_bio_destructor;
         for (f = 0; f < pkt->frames; f++)
                 if (!bio_add_page(pkt->w_bio, bvec[f].bv_page, CD_FRAMESIZE, bvec[f].bv_offset))
                         BUG();