• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · fff648da
    Linus Torvalds authored
    Pull block fixes from Jens Axboe:
     "Here's the second round of block updates for this merge window.
      It's a mix of fixes for changes that went in previously in this round,
      and fixes in general.  This pull request contains:
       - Fixes for loop from Christoph
       - A bdi vs gendisk lifetime fix from Dan, worth two cookies.
       - A blk-mq timeout fix, when on frozen queues.  From Gabriel.
       - Writeback fix from Jan, ensuring that __writeback_single_inode()
         does the right thing.
       - Fix for bio->bi_rw usage in f2fs from me.
       - Error path deadlock fix in blk-mq sysfs registration from me.
       - Floppy O_ACCMODE fix from Jiri.
       - Fix to the new bio op methods from Mike.
         One more followup will be coming here, ensuring that we don't
         propagate the block types outside of block.  That, and a rename of
         bio->bi_rw is coming right after -rc1 is cut.
       - Various little fixes"
    * 'for-linus' of git://git.kernel.dk/linux-block:
      mm/block: convert rw_page users to bio op use
      loop: make do_req_filebacked more robust
      loop: don't try to use AIO for discards
      blk-mq: fix deadlock in blk_mq_register_disk() error path
      Include: blkdev: Removed duplicate 'struct request;' declaration.
      Fixup direct bi_rw modifiers
      block: fix bdi vs gendisk lifetime mismatch
      blk-mq: Allow timeouts to run while queue is freezing
      nbd: fix race in ioctl
      block: fix use-after-free in seq file
      f2fs: drop bio->bi_rw manual assignment
      block: add missing group association in bio-cloning functions
      blkcg: kill unused field nr_undestroyed_grps
      writeback: Write dirty times for WB_SYNC_ALL writeback
      floppy: fix open(O_ACCMODE) for ioctl-only open
extent_io.c 147 KB