1. 18 Dec, 2012 37 commits
  2. 17 Dec, 2012 3 commits
    • Linus Torvalds's avatar
      Revert "bdi: add a user-tunable cpu_list for the bdi flusher threads" · 9360b536
      Linus Torvalds authored
      This reverts commit 8fa72d23.
      
      People disagree about how this should be done, so let's revert this for
      now so that nobody starts using the new tuning interface.  Tejun is
      thinking about a more generic interface for thread pool affinity.
      Requested-by: default avatarTejun Heo <tj@kernel.org>
      Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
      Acked-by: default avatarJens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9360b536
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · fa4c95bf
      Linus Torvalds authored
      Pull ext3, udf, quota fixes from Jan Kara:
       "Some ext3 & quota cleanups and couple of udf fixes"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK
        ext3: drop if around WARN_ON
        ext3: get rid of the duplicate code on ext3_fill_super
        udf: remove un-needed variable from inode_getblk
        udf: don't increment lenExtents while writing to a hole
        udf: fix memory leak while allocating blocks during write
      fa4c95bf
    • Linus Torvalds's avatar
      Merge branch 'for-3.8/core' of git://git.kernel.dk/linux-block · 60da5bf4
      Linus Torvalds authored
      Pull block layer core updates from Jens Axboe:
       "Here are the core block IO bits for 3.8.  The branch contains:
      
         - The final version of the surprise device removal fixups from Bart.
      
         - Don't hide EFI partitions under advanced partition types.  It's
           fairly wide spread these days.  This is especially dangerous for
           systems that have both msdos and efi partition tables, where you
           want to keep them in sync.
      
         - Cleanup of using -1 instead of the proper NUMA_NO_NODE
      
         - Export control of bdi flusher thread CPU mask and default to using
           the home node (if known) from Jeff.
      
         - Export unplug tracepoint for MD.
      
         - Core improvements from Shaohua.  Reinstate the recursive merge, as
           the original bug has been fixed.  Add plugging for discard and also
           fix a problem handling non pow-of-2 discard limits.
      
        There's a trivial merge in block/blk-exec.c due to a fix that went
        into 3.7-rc at a later point than -rc4 where this is based."
      
      * 'for-3.8/core' of git://git.kernel.dk/linux-block:
        block: export block_unplug tracepoint
        block: add plug for blkdev_issue_discard
        block: discard granularity might not be power of 2
        deadline: Allow 0ms deadline latency, increase the read speed
        partitions: enable EFI/GPT support by default
        bsg: Remove unused function bsg_goose_queue()
        block: Make blk_cleanup_queue() wait until request_fn finished
        block: Avoid scheduling delayed work on a dead queue
        block: Avoid that request_fn is invoked on a dead queue
        block: Let blk_drain_queue() caller obtain the queue lock
        block: Rename queue dead flag
        bdi: add a user-tunable cpu_list for the bdi flusher threads
        block: use NUMA_NO_NODE instead of -1
        block: recursive merge requests
        block CFQ: avoid moving request to different queue
      60da5bf4