1. 22 8月, 2014 13 次提交
  2. 20 8月, 2014 9 次提交
  3. 19 8月, 2014 8 次提交
    • L
      Merge tag 'md/3.17-fixes' of git://neil.brown.name/md · 63d871cb
      Linus Torvalds 提交于
      Pull md bugfixes from Neil Brown:
       "Here are the bug-fixes I promised :-)
      
        Funny how you start looking for one and other start appearing.
      
         - raid6 data corruption during recovery
         - raid6 livelock
         - raid10 memory leaks"
      
      * tag 'md/3.17-fixes' of git://neil.brown.name/md:
        md/raid10: always initialise ->state on newly allocated r10_bio
        md/raid10: avoid memory leak on error path during reshape.
        md/raid10: Fix memory leak when raid10 reshape completes.
        md/raid10: fix memory leak when reshaping a RAID10.
        md/raid6: avoid data corruption during recovery of double-degraded RAID6
        md/raid5: avoid livelock caused by non-aligned writes.
      63d871cb
    • L
      Merge tag 'pci-v3.17-changes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · f17a6f78
      Linus Torvalds 提交于
      Pull PCI changes from Bjorn Helgaas:
       "Marvell MVEBU
          - Remove ARCH_KIRKWOOD dependency (Andrew Lunn)
      
        NVIDIA Tegra
          - Add debugfs support (Thierry Reding)
      
        Synopsys DesignWare
          - Look for configuration space in 'reg', not 'ranges' (Kishon Vijay Abraham I)
          - Program ATU with untranslated address (Kishon Vijay Abraham I)
          - Add config access-related pcie_host_ops for v3.65 hardware (Murali Karicheri)
          - Add MSI-related pcie_host_ops for v3.65 hardware (Murali Karicheri)
      
        TI DRA7xx
          - Add TI DR7xx PCIe driver (Kishon Vijay Abraham I)"
      
      * tag 'pci-v3.17-changes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: designware: Add MSI-related pcie_host_ops for v3.65 hardware
        PCI: designware: Add config access-related pcie_host_ops for v3.65 hardware
        PCI: dra7xx: Add TI DRA7xx PCIe driver
        PCI: designware: Program ATU with untranslated address
        PCI: designware: Look for configuration space in 'reg', not 'ranges'
        PCI: tegra: Add debugfs support
        PCI: mvebu: Remove ARCH_KIRKWOOD dependency
      f17a6f78
    • L
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · 7ac0bbf9
      Linus Torvalds 提交于
      Pull devicetree fixes from Grant Likely:
       "Three more commits needed for v3.17: A bug fix for reserved regions
        based at address zero, a clarification on how to interpret existence
        of both interrupts and interrupts-extended properties, and a fix to
        allow device tree testcases to run on any platform"
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
        of/irq: Fix lookup to use 'interrupts-extended' property first
        Enabling OF selftest to run without machine's devicetree
        of: Allow mem_reserve of memory with a base address of zero
      7ac0bbf9
    • D
      frv: Define cpu_relax_lowlatency() · f325f164
      Davidlohr Bueso 提交于
      3a6bfbc9 "(arch,locking: Ciao arch_mutex_cpu_relax()") broke
      building the frv arch.  Fixes errors such as:
      
        kernel/locking/mcs_spinlock.h:87:2: error: implicit declaration of function 'cpu_relax_lowlatency'
      Signed-off-by: NDavidlohr Bueso <davidlohr@hp.com>
      Compile-tested-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f325f164
    • N
      md/raid10: always initialise ->state on newly allocated r10_bio · cb8b12b5
      NeilBrown 提交于
      Most places which allocate an r10_bio zero the ->state, some don't.
      As the r10_bio comes from a mempool, and the allocation function uses
      kzalloc it is often zero anyway.  But sometimes it isn't and it is
      best to be safe.
      
      I only noticed this because of the bug fixed by an earlier patch
      where the r10_bios allocated for a reshape were left around to
      be used by a subsequent resync.  In that case the R10BIO_IsReshape
      flag caused problems.
      Signed-off-by: NNeilBrown <neilb@suse.de>
      cb8b12b5
    • N
      md/raid10: avoid memory leak on error path during reshape. · e337aead
      NeilBrown 提交于
      If raid10 reshape fails to find somewhere to read a block
      from, it returns without freeing memory...
      Signed-off-by: NNeilBrown <neilb@suse.de>
      e337aead
    • N
      md/raid10: Fix memory leak when raid10 reshape completes. · b3968552
      NeilBrown 提交于
      When a raid10 commences a resync/recovery/reshape it allocates
      some buffer space.
      When a resync/recovery completes the buffer space is freed.  But not
      when the reshape completes.
      This can result in a small memory leak.
      
      There is a subtle side-effect of this bug.  When a RAID10 is reshaped
      to a larger array (more devices), the reshape is immediately followed
      by a "resync" of the new space.  This "resync" will use the buffer
      space which was allocated for "reshape".  This can cause problems
      including a "BUG" in the SCSI layer.  So this is suitable for -stable.
      
      Cc: stable@vger.kernel.org (v3.5+)
      Fixes: 3ea7daa5Signed-off-by: NNeilBrown <neilb@suse.de>
      b3968552
    • N
      md/raid10: fix memory leak when reshaping a RAID10. · ce0b0a46
      NeilBrown 提交于
      raid10 reshape clears unwanted bits from a bio->bi_flags using
      a method which, while clumsy, worked until 3.10 when BIO_OWNS_VEC
      was added.
      Since then it clears that bit but shouldn't.  This results in a
      memory leak.
      
      So change to used the approved method of clearing unwanted bits.
      
      As this causes a memory leak which can consume all of memory
      the fix is suitable for -stable.
      
      Fixes: a38352e0
      Cc: stable@vger.kernel.org (v3.10+)
      Reported-by: mdraid.pkoch@dfgh.net (Peter Koch)
      Signed-off-by: NNeilBrown <neilb@suse.de>
      ce0b0a46
  4. 18 8月, 2014 2 次提交
    • N
      md/raid6: avoid data corruption during recovery of double-degraded RAID6 · 9c4bdf69
      NeilBrown 提交于
      During recovery of a double-degraded RAID6 it is possible for
      some blocks not to be recovered properly, leading to corruption.
      
      If a write happens to one block in a stripe that would be written to a
      missing device, and at the same time that stripe is recovering data
      to the other missing device, then that recovered data may not be written.
      
      This patch skips, in the double-degraded case, an optimisation that is
      only safe for single-degraded arrays.
      
      Bug was introduced in 2.6.32 and fix is suitable for any kernel since
      then.  In an older kernel with separate handle_stripe5() and
      handle_stripe6() functions the patch must change handle_stripe6().
      
      Cc: stable@vger.kernel.org (2.6.32+)
      Fixes: 6c0069c0
      Cc: Yuri Tikhonov <yur@emcraft.com>
      Cc: Dan Williams <dan.j.williams@intel.com>
      Reported-by: N"Manibalan P" <pmanibalan@amiindia.co.in>
      Tested-by: N"Manibalan P" <pmanibalan@amiindia.co.in>
      Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1090423Signed-off-by: NNeilBrown <neilb@suse.de>
      Acked-by: NDan Williams <dan.j.williams@intel.com>
      9c4bdf69
    • N
      md/raid5: avoid livelock caused by non-aligned writes. · a40687ff
      NeilBrown 提交于
      If a stripe in a raid6 array received a write to each data block while
      the array is degraded, and if any of these writes to a missing device
      are not page-aligned, then a live-lock happens.
      
      In this case the P and Q blocks need to be read so that the part of
      the missing block which is *not* being updated by the write can be
      constructed.  Due to a logic error, these blocks are not loaded, so
      the update cannot proceed and the stripe is 'handled' repeatedly in an
      infinite loop.
      
      This bug is unlikely as most writes are page aligned.  However as it
      can lead to a livelock it is suitable for -stable.  It was introduced
      in 3.16.
      
      Cc: stable@vger.kernel.org (v3.16)
      Fixed: 67f45548Signed-off-by: NNeilBrown <neilb@suse.de>
      a40687ff
  5. 17 8月, 2014 1 次提交
  6. 16 8月, 2014 7 次提交
    • L
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · 605f884d
      Linus Torvalds 提交于
      Pull x86 platform driver updates from Matthew Garrett:
       "A moderate number of changes, but nothing awfully significant.
      
        A lot of const cleanups, some reworking and additions to the rfkill
        quirks in the asus driver, a new driver for generating falling laptop
        events on Toshibas and some misc fixes.
      
        Maybe vendors have stopped inventing things"
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (41 commits)
        platform/x86: Enable build support for toshiba_haps
        Documentation: Add file about toshiba_haps module
        platform/x86: Toshiba HDD Active Protection Sensor
        asus-nb-wmi: Add wapf4 quirk for the U32U
        alienware-wmi: make hdmi_mux enabled on case-by-case basis
        ideapad-laptop: Constify DMI table and other r/o variables
        asus-nb-wmi.c: Rename x401u quirk to wapf4
        compal-laptop: correct invalid hwmon name
        toshiba_acpi: Add Qosmio X75-A to the alt keymap dmi list
        toshiba_acpi: Add extra check to backlight code
        Fix log message about future removal of interface
        ideapad-laptop: Disable touchpad interface on Yoga models
        asus-nb-wmi: Add wapf4 quirk for the X550CC
        intel_ips: Make ips_mcp_limits variables static
        thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdata
        fujitsu-laptop: Mark fujitsu_dmi_table[] DMI table as __initconst
        hp-wmi: Add missing __init annotations to initialization code
        hp_accel: Constify ACPI and DMI tables
        fujitsu-tablet: Mark DMI callbacks as __init code
        dell-laptop: Mark dell_quirks[] DMI table as __initconst
        ...
      605f884d
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · 49899007
      Linus Torvalds 提交于
      Pull idle update from Len Brown:
       "Two Intel-platform-specific updates to intel_idle, and a cosmetic
        tweak to the turbostat utility"
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        tools/power turbostat: tweak whitespace in output format
        intel_idle: Broadwell support
        intel_idle: Disable Baytrail Core and Module C6 auto-demotion
      49899007
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 6fedb0ff
      Linus Torvalds 提交于
      Pull module fix from Rusty Russell:
       "Nasty potential bug if someone uses a known module param with an
        invalid value (we don't fail unknown module params any more, just
        warn)"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: Clean up ro/nx after early module load failures
      6fedb0ff
    • L
      Merge branch 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio · 90c80969
      Linus Torvalds 提交于
      Pull virtio-rng update from Amit Shah:
       "Add derating factor for use by hwrng core
      
        Sending directly to you with the commit log changes Ted Ts'o pointed
        out.  Not sure if Rusty's back after his travel, but this already has
        his s-o-b"
      
      * 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio:
        virtio: rng: add derating factor for use by hwrng core
      90c80969
    • L
      Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · e64df3eb
      Linus Torvalds 提交于
      Pull btrfs updates from Chris Mason:
       "These are all fixes I'd like to get out to a broader audience.
      
        The biggest of the bunch is Mark's quota fix, which is also in the
        SUSE kernel, and makes our subvolume quotas dramatically more
        accurate.
      
        I've been running xfstests with these against your current git
        overnight, but I'm queueing up longer tests as well"
      
      * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: disable strict file flushes for renames and truncates
        Btrfs: fix csum tree corruption, duplicate and outdated checksums
        Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch
        Btrfs: fix compressed write corruption on enospc
        btrfs: correctly handle return from ulist_add
        btrfs: qgroup: account shared subtrees during snapshot delete
        Btrfs: read lock extent buffer while walking backrefs
        Btrfs: __btrfs_mod_ref should always use no_quota
        btrfs: adjust statfs calculations according to raid profiles
      e64df3eb
    • L
      Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux · 53b95d63
      Linus Torvalds 提交于
      Pull file locking bugfixes from Jeff Layton:
       "Most of these patches are to fix a long-standing regression that crept
        in when the BKL was removed from the file-locking code.  The code was
        converted to use a conventional spinlock, but some fl_release_private
        ops can block and you can end up sleeping inside the lock.
      
        There's also a patch to make /proc/locks show delegations as 'DELEG'"
      
      * tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux:
        locks: update Locking documentation to clarify fl_release_private behavior
        locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock
        locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped
        locks: don't reuse file_lock in __posix_lock_file
        locks: don't call locks_release_private from locks_copy_lock
        locks: show delegations as "DELEG" in /proc/locks
      53b95d63
    • L
      Merge git://git.kvack.org/~bcrl/aio-next · da06df54
      Linus Torvalds 提交于
      Pull aio updates from Ben LaHaise.
      
      * git://git.kvack.org/~bcrl/aio-next:
        aio: use iovec array rather than the single one
        aio: fix some comments
        aio: use the macro rather than the inline magic number
        aio: remove the needless registration of ring file's private_data
        aio: remove no longer needed preempt_disable()
        aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx()
        aio: change exit_aio() to load mm->ioctx_table once and avoid rcu_read_lock()
      da06df54