• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 5e57dc81
    Linus Torvalds authored
    Pull block IO fixes from Jens Axboe:
     "Second round of updates and fixes for 3.14-rc2.  Most of this stuff
      has been queued up for a while.  The notable exception is the blk-mq
      changes, which are naturally a bit more in flux still.
      The pull request contains:
       - Two bug fixes for the new immutable vecs, causing crashes with raid
         or swap.  From Kent.
       - Various blk-mq tweaks and fixes from Christoph.  A fix for
         integrity bio's from Nic.
       - A few bcache fixes from Kent and Darrick Wong.
       - xen-blk{front,back} fixes from David Vrabel, Matt Rushton, Nicolas
         Swenson, and Roger Pau Monne.
       - Fix for a vec miscount with integrity vectors from Martin.
       - Minor annotations or fixes from Masanari Iida and Rashika Kheria.
       - Tweak to null_blk to do more normal FIFO processing of requests
         from Shlomo Pongratz.
       - Elevator switching bypass fix from Tejun.
       - Softlockup in blkdev_issue_discard() fix when !CONFIG_PREEMPT from
    * 'for-linus' of git://git.kernel.dk/linux-block: (31 commits)
      block: add cond_resched() to potentially long running ioctl discard loop
      xen-blkback: init persistent_purge_work work_struct
      blk-mq: pair blk_mq_start_request / blk_mq_requeue_request
      blk-mq: dont assume rq->errors is set when returning an error from ->queue_rq
      block: Fix cloning of discard/write same bios
      block: Fix type mismatch in ssize_t_blk_mq_tag_sysfs_show
      blk-mq: rework flush sequencing logic
      null_blk: use blk_complete_request and blk_mq_complete_request
      virtio_blk: use blk_mq_complete_request
      blk-mq: rework I/O completions
      fs: Add prototype declaration to appropriate header file include/linux/bio.h
      fs: Mark function as static in fs/bio-integrity.c
      block/null_blk: Fix completion processing from LIFO to FIFO
      block: Explicitly handle discard/write same segments
      block: Fix nr_vecs for inline integrity vectors
      blk-mq: Add bio_integrity setup to blk_mq_make_request
      blk-mq: initialize sg_reserved_size
      blk-mq: handle dma_drain_size
      blk-mq: divert __blk_put_request for MQ ops
      blk-mq: support at_head inserations for blk_execute_rq
percpu_ida.c 9.57 KB