1. 24 Aug, 2011 1 commit
  2. 23 Aug, 2011 10 commits
  3. 22 Aug, 2011 11 commits
  4. 21 Aug, 2011 4 commits
  5. 20 Aug, 2011 4 commits
  6. 19 Aug, 2011 10 commits
    • Jiaying Zhang's avatar
      ext4: flush any pending end_io requests before DIO reads w/dioread_nolock · dccaf33f
      Jiaying Zhang authored
      There is a race between ext4 buffer write and direct_IO read with
      dioread_nolock mount option enabled. The problem is that we clear
      PageWriteback flag during end_io time but will do
      uninitialized-to-initialized extent conversion later with dioread_nolock.
      If an O_direct read request comes in during this period, ext4 will return
      zero instead of the recently written data.
      
      This patch checks whether there are any pending uninitialized-to-initialized
      extent conversion requests before doing O_direct read to close the race.
      Note that this is just a bandaid fix. The fundamental issue is that we
      clear PageWriteback flag before we really complete an IO, which is
      problem-prone. To fix the fundamental issue, we may need to implement an
      extent tree cache that we can use to look up pending to-be-converted extents.
      Signed-off-by: default avatarJiaying Zhang <jiayingz@google.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Cc: stable@kernel.org
      dccaf33f
    • Jesse Barnes's avatar
      drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge · b095cd0a
      Jesse Barnes authored
      Prior to Ivybridge, the GFX_MODE would default to 0x800, meaning that
      MI_FLUSH would flush the TLBs in addition to the rest of the caches
      indicated in the MI_FLUSH command.  However starting with Ivybridge, the
      register defaults to 0x2800 out of reset, meaning that to invalidate the
      TLB we need to use PIPE_CONTROL.  Since we're not doing that yet, go
      back to the old default so things work.
      
      v2: don't forget to actually *clear* the new bit
      Reviewed-by: default avatarEric Anholt <eric@anholt.net>
      Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Tested-by: default avatarKenneth Graunke <kenneth@whitecape.org>
      Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      b095cd0a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 5ccc3874
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-block: (23 commits)
        Revert "cfq: Remove special treatment for metadata rqs."
        block: fix flush machinery for stacking drivers with differring flush flags
        block: improve rq_affinity placement
        blktrace: add FLUSH/FUA support
        Move some REQ flags to the common bio/request area
        allow blk_flush_policy to return REQ_FSEQ_DATA independent of *FLUSH
        xen/blkback: Make description more obvious.
        cfq-iosched: Add documentation about idling
        block: Make rq_affinity = 1 work as expected
        block: swim3: fix unterminated of_device_id table
        block/genhd.c: remove useless cast in diskstats_show()
        drivers/cdrom/cdrom.c: relax check on dvd manufacturer value
        drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse
        bsg-lib: add module.h include
        cfq-iosched: Reduce linked group count upon group destruction
        blk-throttle: correctly determine sync bio
        loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other
        loop: add BLK_DEV_LOOP_MIN_COUNT=%i to allow distros 0 pre-allocated loop devices
        loop: add management interface for on-demand device allocation
        loop: replace linked list of allocated devices with an idr index
        ...
      5ccc3874
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 0c3bef61
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: OF: Don't crash when bridge parent is NULL.
        PCI: export pcie_bus_configure_settings symbol
        PCI: code and comments cleanup
        PCI: make cardbus-bridge resources optional
        PCI: make SRIOV resources optional
        PCI : ability to relocate assigned pci-resources
        PCI: honor child buses add_size in hot plug configuration
        PCI: Set PCI-E Max Payload Size on fabric
      0c3bef61
    • Vasily Khoruzhick's avatar
      s3c-adc-battery: Fix compilation error due to missing header (module.h) · 815efa1e
      Vasily Khoruzhick authored
      Add linux/module.h to fix this compilation error:
      
      drivers/power/s3c_adc_battery.c:435:15: error: expected declaration specifiers or ‘...’ before string constant
      drivers/power/s3c_adc_battery.c:435:1: warning: data definition has no type or storage class
      drivers/power/s3c_adc_battery.c:435:1: warning: type defaults to ‘int’ in declaration of ‘MODULE_AUTHOR’
      drivers/power/s3c_adc_battery.c:435:15: warning: function declaration isn’t a prototype
      drivers/power/s3c_adc_battery.c:436:20: error: expected declaration specifiers or ‘...’ before string constant
      drivers/power/s3c_adc_battery.c:436:1: warning: data definition has no type or storage class
      drivers/power/s3c_adc_battery.c:436:1: warning: type defaults to ‘int’ in declaration of ‘MODULE_DESCRIPTION’
      drivers/power/s3c_adc_battery.c:436:20: warning: function declaration isn’t a prototype
      drivers/power/s3c_adc_battery.c:437:16: error: expected declaration specifiers or ‘...’ before string constant
      drivers/power/s3c_adc_battery.c:437:1: warning: data definition has no type or storage class
      drivers/power/s3c_adc_battery.c:437:1: warning: type defaults to ‘int’ in declaration of ‘MODULE_LICENSE’
      drivers/power/s3c_adc_battery.c:437:16: warning: function declaration isn’t a prototype
      make[2]: *** [drivers/power/s3c_adc_battery.o] Error 1
      Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
      Signed-off-by: default avatarIan Lartey <ian@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
      815efa1e
    • Axel Lin's avatar
      max8997_charger: Needs module.h · 71aa79a8
      Axel Lin authored
      power/max8997_charger.c uses interfaces from linux/module.h,
      so it should include that file.  This fixes build errors.
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Acked-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
      Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
      71aa79a8
    • Randy Dunlap's avatar
      max8998_charger: Needs module.h · d555ab6b
      Randy Dunlap authored
      power/max8998_charger.c uses interfaces from linux/module.h,
      so it should include that file.  This fixes build errors.
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
      d555ab6b
    • David Daney's avatar
      PCI: OF: Don't crash when bridge parent is NULL. · 69566dd8
      David Daney authored
      In pcibios_get_phb_of_node(), we will crash while booting if
      bus->bridge->parent is NULL.
      
      Check for this case and avoid dereferencing the NULL pointer.
      Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
      Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      69566dd8
    • Jens Axboe's avatar
      Revert "cfq: Remove special treatment for metadata rqs." · b53d1ed7
      Jens Axboe authored
      We have a kernel build regression since 3.1-rc1, which is about 10%
      regression. The kernel source is in an ext3 filesystem.
      Alex Shi bisect it to commit:
      commit a07405b7
      Author: Justin TerAvest <teravest@google.com>
      Date:   Sun Jul 10 22:09:19 2011 +0200
      
          cfq: Remove special treatment for metadata rqs.
      
      Apparently this is caused by lack metadata preemption, where ext3/ext4
      do use READ_META. I didn't see a way to fix the issue, so suggest
      reverting the patch.
      
      This reverts commit a07405b7.
      
      Reported-by: Alex Shi<alex.shi@intel.com>
      Reported-by: Shaohua Li<shaohua.li@intel.com>
      Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
      b53d1ed7
    • Takashi Iwai's avatar
      ALSA: usb-audio - Fix missing mixer dB information · 38b65190
      Takashi Iwai authored
      The recent fix for testing dB range at the mixer creation time seems
      to cause regressions in some devices.  In such devices, reading the dB
      info at probing time gives an error, thus both dBmin and dBmax are still
      zero, and TLV flag isn't set although the later read of dB info succeeds.
      
      This patch adds a workaround for such a case by assuming that the later
      read will succeed.  In future, a similar test should be performed in a
      case where a wrong dB range is seen even in the later read.
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      Cc: <stable@kernel.org>
      38b65190