Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.39-rc5
Commits on Apr 27, 2011
  1. @torvalds

    Linux 2.6.39-rc5

    torvalds authored
  2. @torvalds

    init/Kconfig: fix EXPERT menu list

    Randy Dunlap authored torvalds committed
    The EXPERT menu list was recently broken by the insertion of a
    kconfig symbol (EMBEDDED) at the beginning of the EXPERT list of
    kconfig items.  Broken by:
    
      commit 6a108a1
      Author: David Rientjes <rientjes@google.com>
      Date:   Thu Jan 20 14:44:16 2011 -0800
        kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
    
    Restore the EXPERT menu list -- don't inject a symbol (EMBEDDED)
    that does not depend on EXPERT into the list.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: David Rientjes <rientjes@google.com>
    Cc: Peter Foley <pefoley2@verizon.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 26, 2011
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Erratum #637 workaround
      amd64_edac: Factor in CC6 save area
      amd64_edac: Remove node interleave warning
      EDAC: Remove debugging output in scrub rate handling
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: iTCO_wdt: TCO Watchdog patch for Intel Panther Point PCH
  3. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] kvm-390: Let kernel exit SIE instruction on work
      [S390] dasd: check sense type in device change handler
      [S390] pfault: fix token handling
      [S390] qdio: reset error states immediately
      [S390] fix page table walk for changing page attributes
      [S390] prng: prevent access beyond end of stack
      [S390] dasd: fix race between open and offline
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: cleanup error handling in inode.c
      Btrfs: put the right bio if we have an error
      Btrfs: free bitmaps properly when evicting the cache
      Btrfs: Free free_space item properly in btrfs_trim_block_group()
      btrfs: add missing spin_unlock to a rare exit path
      Btrfs: check return value of kmalloc()
      btrfs: fix wrong allocating flag when reading page
      Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()
  5. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: do some plugging in the submit_bio threads
  6. amd64_edac: Erratum #637 workaround

    Borislav Petkov authored
    F15h CPUs may report a non-DRAM address when reporting an error address
    belonging to a CC6 state save area. Add a workaround to detect this
    condition and compute the actual DRAM address of the error as documented
    in the Revision Guide for AMD Family 15h Models 00h-0Fh Processors.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
  7. amd64_edac: Factor in CC6 save area

    Borislav Petkov authored
    F15h and later use a portion of DRAM as a CC6 storage area. BIOS
    programs D18F1x[17C:140,7C:40] DRAM Base/Limit accordingly by
    subtracting the storage area from the DRAM limit setting. However, in
    order for edac to consider that part of DRAM too, we need to include it
    into the per-node range.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
  8. amd64_edac: Remove node interleave warning

    Borislav Petkov authored
    This warning was wrongfully added for a normal condition - intlvsel
    actually selects the destination node when node interleaving is enabled
    and it is not a mismatch. For a detailed example, see section 2.8.10.2
    "Node Interleaving" in F10h BKDG.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
  9. watchdog: iTCO_wdt: TCO Watchdog patch for Intel Panther Point PCH

    Seth Heasley authored Wim Van Sebroeck committed
    This patch adds the TCO Watchdog DeviceIDs for the Intel Panther Point PCH.
    
    Signed-off-by: Seth Heasley <seth.heasley@intel.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  10. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      CIFS: Fix memory over bound bug in cifs_parse_mount_options
  11. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ecryptfs/ecryptfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
      eCryptfs: Flush dirty pages in setattr
      eCryptfs: Handle failed metadata read in lookup
      eCryptfs: Add reference counting to lower files
      eCryptfs: dput dentries returned from dget_parent
      eCryptfs: Remove extra d_delete in ecryptfs_rmdir
  12. @torvalds

    Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/linusw/linux-stericsson
    
    * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
      rtc: fix coh901331 startup crash
      mach-ux500: fix i2c0 device setup regression
  13. @eparis @torvalds

    SELINUX: Make selinux cache VFS RCU walks safe

    eparis authored torvalds committed
    Now that the security modules can decide whether they support the
    dcache RCU walk or not it's possible to make selinux a bit more
    RCU friendly.  The SELinux AVC and security server access decision
    code is RCU safe.  A specific piece of the LSM audit code may not
    be RCU safe.
    
    This patch makes the VFS RCU walk retry if it would hit the non RCU
    safe chunk of code.  It will normally just work under RCU.  This is
    done simply by passing the VFS RCU state as a flag down into the
    avc_audit() code and returning ECHILD there if it would have an issue.
    
    Based-on-patch-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @torvalds

    add hlist_bl_lock/unlock helpers

    Christoph Hellwig authored torvalds committed
    Now that the whole dcache_hash_bucket crap is gone, go all the way and
    also remove the weird locking layering violations for locking the hash
    buckets.  Add hlist_bl_lock/unlock helpers to move the locking into the
    list abstraction instead of requiring each caller to open code it.
    After all allowing for the bit locks is the whole point of these helpers
    over the plain hlist variant.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @torvalds

    bit_spinlock: don't play preemption games inside the busy loop

    torvalds authored
    When we are waiting for the bit-lock to be released, and are looping
    over the 'cpu_relax()' should not be doing anything else - otherwise we
    miss the point of trying to do the whole 'cpu_relax()'.
    
    Do the preemption enable/disable around the loop, rather than inside of
    it.
    
    Noticed when I was looking at the code generation for the dcache
    __d_drop usage, and the code just looked very odd.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 25, 2011
  1. eCryptfs: Flush dirty pages in setattr

    Tyler Hicks authored
    After 57db4e8 changed eCryptfs to
    write-back caching, eCryptfs page writeback updates the lower inode
    times due to the use of vfs_write() on the lower file.
    
    To preserve inode metadata changes, such as 'cp -p' does with
    utimensat(), we need to flush all dirty pages early in
    ecryptfs_setattr() so that the user-updated lower inode metadata isn't
    clobbered later in writeback.
    
    https://bugzilla.kernel.org/show_bug.cgi?id=33372
    
    Reported-by: Rocko <rockorequin@hotmail.com>
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  2. eCryptfs: Handle failed metadata read in lookup

    Tyler Hicks authored
    When failing to read the lower file's crypto metadata during a lookup,
    eCryptfs must continue on without throwing an error. For example, there
    may be a plaintext file in the lower mount point that the user wants to
    delete through the eCryptfs mount.
    
    If an error is encountered while reading the metadata in lookup(), the
    eCryptfs inode's size could be incorrect. We must be sure to reread the
    plaintext inode size from the metadata when performing an open() or
    setattr(). The metadata is already being read in those paths, so this
    adds minimal performance overhead.
    
    This patch introduces a flag which will track whether or not the
    plaintext inode size has been read so that an incorrect i_size can be
    fixed in the open() or setattr() paths.
    
    https://bugs.launchpad.net/bugs/509180
    
    Cc: <stable@kernel.org>
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  3. @chrismason-xx

    Btrfs: cleanup error handling in inode.c

    Tsutomu Itoh authored chrismason-xx committed
    The error processing of several places is changed like setting the
    error number only at the error.
    
    Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  4. @chrismason-xx

    Btrfs: put the right bio if we have an error

    Josef Bacik authored chrismason-xx committed
    In btrfs_submit_direct_hook if the first btrfs_map_block fails we need to put
    the orig_bio, not bio.
    
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  5. @chrismason-xx

    Btrfs: free bitmaps properly when evicting the cache

    Josef Bacik authored chrismason-xx committed
    If our space cache is wrong, we do the right thing and free up everything that
    we loaded, however we don't reset the total_bitmaps counter or the thresholds or
    anything.  So in btrfs_remove_free_space_cache make sure to call free_bitmap()
    if it's a bitmap, this will keep us from panicing when we check to make sure we
    don't have too many bitmaps.  Thanks,
    
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  6. @chrismason-xx

    Btrfs: Free free_space item properly in btrfs_trim_block_group()

    Li Zefan authored chrismason-xx committed
    Since commit dc89e98, we've changed
    to use a specific slab for alocation of free_space items.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  7. @chrismason-xx

    btrfs: add missing spin_unlock to a rare exit path

    David Sterba authored chrismason-xx committed
    Signed-off-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  8. @chrismason-xx

    Btrfs: check return value of kmalloc()

    Tsutomu Itoh authored chrismason-xx committed
    The check on the return value of kmalloc() is added to some places.
    
    Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  9. @chrismason-xx

    btrfs: fix wrong allocating flag when reading page

    Itaru Kitayama authored chrismason-xx committed
    the space cache use extent_readpages() to read free space information,
    so we can not use GFP_KERNEL flag to allocate memory, or it may lead
    to deadlock.
    
    Signed-off-by: Itaru Kitayama <kitayama@cl.bb4u.ne.jp>
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  10. @chrismason-xx

    Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()

    Tsutomu Itoh authored chrismason-xx committed
    It is necessary to unlock mutex_lock before it return an error when
    btrfs_alloc_path() fails.
    
    Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  11. eCryptfs: Add reference counting to lower files

    Tyler Hicks authored
    For any given lower inode, eCryptfs keeps only one lower file open and
    multiplexes all eCryptfs file operations through that lower file. The
    lower file was considered "persistent" and stayed open from the first
    lookup through the lifetime of the inode.
    
    This patch keeps the notion of a single, per-inode lower file, but adds
    reference counting around the lower file so that it is closed when not
    currently in use. If the reference count is at 0 when an operation (such
    as open, create, etc.) needs to use the lower file, a new lower file is
    opened. Since the file is no longer persistent, all references to the
    term persistent file are changed to lower file.
    
    Locking is added around the sections of code that opens the lower file
    and assign the pointer in the inode info, as well as the code the fputs
    the lower file when all eCryptfs users are done with it.
    
    This patch is needed to fix issues, when mounted on top of the NFSv3
    client, where the lower file is left silly renamed until the eCryptfs
    inode is destroyed.
    
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  12. eCryptfs: dput dentries returned from dget_parent

    Tyler Hicks authored
    Call dput on the dentries previously returned by dget_parent() in
    ecryptfs_rename(). This is needed for supported eCryptfs mounts on top
    of the NFSv3 client.
    
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  13. eCryptfs: Remove extra d_delete in ecryptfs_rmdir

    Tyler Hicks authored
    vfs_rmdir() already calls d_delete() on the lower dentry. That was being
    duplicated in ecryptfs_rmdir() and caused a NULL pointer dereference
    when NFSv3 was the lower filesystem.
    
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Commits on Apr 24, 2011
  1. @torvalds

    Merge branch 'dcache-cleanup'

    torvalds authored
    * dcache-cleanup:
      vfs: get rid of insane dentry hashing rules
  2. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: ahci_start_engine compliant to AHCI spec
      ata: pata_at91.c bugfix for initial_timing initialisation
      ata: pata_at91.c bugfix for high master clock
      ahci: AHCI-mode SATA patch for Intel Panther Point DeviceIDs
      ata_piix: IDE-mode SATA patch for Intel Panther Point DeviceIDs
      libata: Pioneer DVR-216D can't do SETXFER
      ahci: don't enable port irq before handler is registered
      libata: Implement ATA_FLAG_NO_DIPM and apply it to mcp65
      libata: Kill unused ATA_DFLAG_{H|D}IPM flags
      ahci: EM supported message type sysfs attribute
  3. @torvalds

    Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6

    torvalds authored
    * 'for-linus' of git://git.infradead.org/ubifs-2.6:
      UBIFS: fix master node recovery
      UBIFS: fix false assertion warning in case of I/O failures
      UBIFS: fix false space checking failure
  4. libata: ahci_start_engine compliant to AHCI spec

    Jian Peng authored Jeff Garzik committed
    At the end of section 10.1 of AHCI spec (rev 1.3), it states
    
    Software shall not set PxCMD.ST to 1 until it is determined that
    a functoinal device is present on the port as determined by
    PxTFD.STS.BSY=0, PxTFD.STS.DRQ=0 and PxSSTS.DET=3h
    
    Even though most AHCI host controller works without this check,
    specific controller will fail under this condition.
    
    Signed-off-by: Jian Peng <jipeng2005@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  5. ata: pata_at91.c bugfix for initial_timing initialisation

    Igor Plyatov authored Jeff Garzik committed
    The "struct ata_timing" must contain 10 members, but ".dmack_hold" member was
    forgotten for "initial_timing" initialisation. This patch fixes such a problem.
    
    Signed-off-by: Igor Plyatov <plyatov@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Something went wrong with that request. Please try again.