Skip to content
  1. Feb 02, 2008
  2. Feb 01, 2008
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 24e1c13c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        block: kill swap_io_context()
        as-iosched: fix inconsistent ioc->lock context
        ide-cd: fix leftover data BUG
        block: make elevator lib checkpatch compliant
        cfq-iosched: make checkpatch compliant
        block: make core bits checkpatch compliant
        block: new end request handling interface should take unsigned byte counts
        unexport add_disk_randomness
        block/sunvdc.c:print_version() must be __devinit
        splice: always updated atime in direct splice
      24e1c13c
    • Jens Axboe's avatar
      block: kill swap_io_context() · 3bc217ff
      Jens Axboe authored
      
      
      It blindly copies everything in the io_context, including the lock.
      That doesn't work so well for either lock ordering or lockdep.
      
      There seems zero point in swapping io contexts on a request to request
      merge, so the best point of action is to just remove it.
      
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      3bc217ff