Permalink
Switch branches/tags
Commits on Jul 20, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jul 20, 2010
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: do not include cap/dentry releases in replayed messages
      ceph: reuse request message when replaying against recovering mds
      ceph: fix creation of ipv6 sockets
      ceph: fix parsing of ipv6 addresses
      ceph: fix printing of ipv6 addrs
      ceph: add kfree() to error path
      ceph: fix leak of mon authorizer
      ceph: fix message revocation
  2. Merge branch 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jul 20, 2010
    …/git/rdunlap/linux-docs
    
    * 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
      documentation: fix almost duplicate filenames (IO/io-mapping.txt)
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Jul 20, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
      bridge: Partially disable netpoll support
      tcp: fix crash in tcp_xmit_retransmit_queue
      IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())
      ibmveth: lost IRQ while closing/opening device leads to service loss
      rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()
      vhost: avoid pr_err on condition guest can trigger
      ipmr: Don't leak memory if fib lookup fails.
      vhost-net: avoid flush under lock
      net: fix problem in reading sock TX queue
      net/core: neighbour update Oops
      net: skb_tx_hash() fix relative to skb_orphan_try()
      rfs: call sock_rps_record_flow() in tcp_splice_read()
      xfrm: do not assume that template resolving always returns xfrms
      hostap_pci: set dev->base_addr during probe
      axnet_cs: use spin_lock_irqsave in ax_interrupt
      dsa: Fix Kconfig dependencies.
      act_nat: not all of the ICMP packets need an IP header payload
      r8169: incorrect identifier for a 8168dp
      Phonet: fix skb leak in pipe endpoint accept()
      Bluetooth: Update sec_level/auth_type for already existing connections
      ...
  4. vfs: fix RCU-lockdep false positive due to /proc

    paulmck authored and torvalds committed Jul 20, 2010
    If a single-threaded process does a file-descriptor operation, and some
    other process accesses that same file descriptor via /proc, the current
    rcu_dereference_check_fdtable() can give a false-positive RCU-lockdep
    splat due to the reference count being increased by the /proc access after
    the reference-count check in fget_light() but before the check in
    rcu_dereference_check_fdtable().
    
    This commit prevents this false positive by checking for a single-threaded
    process.  To avoid #include hell, this commit uses the wrapper for
    thread_group_empty(current) defined by rcu_my_thread_group_empty()
    provided in a separate commit.
    
    Located-by: Miles Lane <miles.lane@gmail.com>
    Located-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: Al Viro <viro@ZenIV.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. sdhci-s3c: add missing remove function

    Marek Szyprowski authored and torvalds committed Jul 20, 2010
    System will crash sooner or later once the memory with the code of the
    s3c-sdhci.ko module is reused for something else. I really have no idea
    how the lack of remove function went unnoticed into the mainline code.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. Andres has moved

    dilinger authored and torvalds committed Jul 20, 2010
    My Collabora address is no longer enabled - update the MODULE_AUTHOR
    fields of drivers to my current email address.
    
    Signed-off-by: Andres Salomon <dilinger@queued.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. x86,nobootmem: make alloc_bootmem_node fall back to other node when 3…

    Yinghai Lu authored and torvalds committed Jul 20, 2010
    …2bit numa is used
    
    Borislav Petkov reported his 32bit numa system has problem:
    
    [    0.000000] Reserving total of 4c00 pages for numa KVA remap
    [    0.000000] kva_start_pfn ~ 32800 max_low_pfn ~ 375fe
    [    0.000000] max_pfn = 238000
    [    0.000000] 8202MB HIGHMEM available.
    [    0.000000] 885MB LOWMEM available.
    [    0.000000]   mapped low ram: 0 - 375fe000
    [    0.000000]   low ram: 0 - 375fe000
    [    0.000000] alloc (nid=8 100000 - 7ee00000) (1000000 - ffffffff) 1000 1000 => 34e7000
    [    0.000000] alloc (nid=8 100000 - 7ee00000) (1000000 - ffffffff) 200 40 => 34c9d80
    [    0.000000] alloc (nid=0 100000 - 7ee00000) (1000000 - ffffffffffffffff) 180 40 => 34e6140
    [    0.000000] alloc (nid=1 80000000 - c7e60000) (1000000 - ffffffffffffffff) 240 40 => 80000000
    [    0.000000] BUG: unable to handle kernel paging request at 40000000
    [    0.000000] IP: [<c2c8cff1>] __alloc_memory_core_early+0x147/0x1d6
    [    0.000000] *pdpt = 0000000000000000 *pde = f000ff53f000ff00
    ...
    [    0.000000] Call Trace:
    [    0.000000]  [<c2c8b4f8>] ? __alloc_bootmem_node+0x216/0x22f
    [    0.000000]  [<c2c90c9b>] ? sparse_early_usemaps_alloc_node+0x5a/0x10b
    [    0.000000]  [<c2c9149e>] ? sparse_init+0x1dc/0x499
    [    0.000000]  [<c2c79118>] ? paging_init+0x168/0x1df
    [    0.000000]  [<c2c780ff>] ? native_pagetable_setup_start+0xef/0x1bb
    
    looks like it allocates too much high address for bootmem.
    
    Try to cut limit with get_max_mapped()
    
    Reported-by: Borislav Petkov <borislav.petkov@amd.com>
    Tested-by: Conny Seidel <conny.seidel@amd.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: <stable@kernel.org>		[2.6.34.x]
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
    Cc: Mel Gorman <mel@csn.ul.ie>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. x86, numa: fix boot without RAM on node0 again

    Yinghai Lu authored and torvalds committed Jul 20, 2010
    Commit e534c7c ("numa: x86_64: use generic percpu var
    numa_node_id() implementation") broke numa systems that don't have ram
    on node0 when MEMORY_HOTPLUG is enabled, because cpu_up() will call
    cpu_to_node() before per_cpu(numa_node) is setup for APs.
    
    When Node0 doesn't have RAM, on x86, cpus already round it to nearest
    node with RAM in x86_cpu_to_node_map.  and per_cpu(numa_node) is not set
    up until in c_init for APs.
    
    When later cpu_up() calling cpu_to_node() will get 0 again, and make it
    online even there is no RAM on node0.  so later all APs can not booted up,
    and later will have panic.
    
    [    1.611101] On node 0 totalpages: 0
    .........
    [    2.608558] On node 0 totalpages: 0
    [    2.612065] Brought up 1 CPUs
    [    2.615199] Total of 1 processors activated (3990.31 BogoMIPS).
    ...
       93.225341] calling  loop_init+0x0/0x1a4 @ 1
    [   93.229314] PERCPU: allocation failed, size=80 align=8, failed to populate
    [   93.246539] Pid: 1, comm: swapper Tainted: G        W   2.6.35-rc4-tip-yh-04371-gd64e6c4-dirty #354
    [   93.264621] Call Trace:
    [   93.266533]  [<ffffffff81125e43>] pcpu_alloc+0x83a/0x8e7
    [   93.270710]  [<ffffffff81125f15>] __alloc_percpu+0x10/0x12
    [   93.285849]  [<ffffffff8140786c>] alloc_disk_node+0x94/0x16d
    [   93.291811]  [<ffffffff81407956>] alloc_disk+0x11/0x13
    [   93.306157]  [<ffffffff81503e51>] loop_alloc+0xa7/0x180
    [   93.310538]  [<ffffffff8277ef48>] loop_init+0x9b/0x1a4
    [   93.324909]  [<ffffffff8277eead>] ? loop_init+0x0/0x1a4
    [   93.329650]  [<ffffffff810001f2>] do_one_initcall+0x57/0x136
    [   93.345197]  [<ffffffff827486d0>] kernel_init+0x184/0x20e
    [   93.348146]  [<ffffffff81034954>] kernel_thread_helper+0x4/0x10
    [   93.365194]  [<ffffffff81c7cc3c>] ? restore_args+0x0/0x30
    [   93.369305]  [<ffffffff8274854c>] ? kernel_init+0x0/0x20e
    [   93.386011]  [<ffffffff81034950>] ? kernel_thread_helper+0x0/0x10
    [   93.392047] loop: out of memory
    ...
    
    Try to assign per_cpu(numa_node) early
    
    [akpm@linux-foundation.org: tidy up code comment]
    Signed-off-by: Yinghai <yinghai@kernel.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Denys Vlasenko <vda.linux@googlemail.com>
    Acked-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. edac: mpc85xx: add support for MPC8569 EDAC controllers

    Anton Vorontsov authored and torvalds committed Jul 20, 2010
    Simply add a proper ID into the device table.
    
    Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
    Cc: Doug Thompson <dougthompson@xmission.com>
    Cc: Peter Tyser <ptyser@xes-inc.com>
    Cc: Dave Jiang <djiang@mvista.com>
    Cc: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. edac: mpc85xx: fix MPC85xx dependency

    Anton Vorontsov authored and torvalds committed Jul 20, 2010
    Since commit 5753c08 ("powerpc/85xx:
    Kconfig cleanup"), there is no MPC85xx Kconfig symbol anymore, so the
    driver became non-selectable.
    
    This patch fixes the issue by switching to PPC_85xx symbol.
    
    Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
    Cc: Doug Thompson <dougthompson@xmission.com>
    Cc: Peter Tyser <ptyser@xes-inc.com>
    Cc: Dave Jiang <djiang@mvista.com>
    Cc: Kumar Gala <galak@kernel.crashing.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. mm/vmscan.c: fix mapping use after free

    Nick Piggin authored and torvalds committed Jul 20, 2010
    We need lock_page_nosync() here because we have no reference to the
    mapping when taking the page lock.
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Mel Gorman <mel@csn.ul.ie>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. ipc/sem.c: bugfix for semop() not reporting successful operation

    manfred-colorfu authored and torvalds committed Jul 20, 2010
    The last change to improve the scalability moved the actual wake-up out of
    the section that is protected by spin_lock(sma->sem_perm.lock).
    
    This means that IN_WAKEUP can be in queue.status even when the spinlock is
    acquired by the current task.  Thus the same loop that is performed when
    queue.status is read without the spinlock acquired must be performed when
    the spinlock is acquired.
    
    Thanks to kamezawa.hiroyu@jp.fujitsu.com for noticing lack of the memory
    barrier.
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16255
    
    [akpm@linux-foundation.org: clean up kerneldoc, checkpatch warning and whitespace]
    Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
    Reported-by: Luca Tettamanti <kronos.it@gmail.com>
    Tested-by: Luca Tettamanti <kronos.it@gmail.com>
    Reported-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Maciej Rutecki <maciej.rutecki@gmail.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. documentation: fix almost duplicate filenames (IO/io-mapping.txt)

    Randy Dunlap
    Randy Dunlap committed Jul 19, 2010
    Having both IO-mapping.txt and io-mapping.txt in Documentation/
    was confusing and/or bothersome to some people, so rename
    IO-mapping.txt to bus-virt-phys-mapping.txt.  Also update
    Documentation/00-INDEX for both of these files.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Kees Bakker <kees.bakker@xs4all.nl>
    Cc: Keith Packard <keithp@keithp.com>
  14. Merge git://git.infradead.org/users/cbou/battery-2.6.35

    torvalds committed Jul 20, 2010
    * git://git.infradead.org/users/cbou/battery-2.6.35:
      ds2782_battery: Fix ds2782_get_capacity return value
  15. bridge: Partially disable netpoll support

    herbertx authored and davem330 committed Jul 19, 2010
    The new netpoll code in bridging contains use-after-free bugs
    that are non-trivial to fix.
    
    This patch fixes this by removing the code that uses skbs after
    they're freed.
    
    As a consequence, this means that we can no longer call bridge
    from the netpoll path, so this patch also removes the controller
    function in order to disable netpoll.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    
    Thanks,
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. Merge branch 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds committed Jul 20, 2010
    …git/dgc/xfsdev
    
    * 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:
      xfs: track AGs with reclaimable inodes in per-ag radix tree
      xfs: convert inode shrinker to per-filesystem contexts
      mm: add context argument to shrinker callback
  17. Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    torvalds committed Jul 20, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: fix checks in BTRFS_IOC_CLONE_RANGE
      Btrfs: fix CLONE ioctl destination file size expansion to block boundary
      Btrfs: fix split_leaf double split corner case
Commits on Jul 19, 2010
  1. xfs: track AGs with reclaimable inodes in per-ag radix tree

    Dave Chinner authored and dchinner committed Jul 19, 2010
    https://bugzilla.kernel.org/show_bug.cgi?id=16348
    
    When the filesystem grows to a large number of allocation groups,
    the summing of recalimable inodes gets expensive. In many cases,
    most AGs won't have any reclaimable inodes and so we are wasting CPU
    time aggregating over these AGs. This is particularly important for
    the inode shrinker that gets called frequently under memory
    pressure.
    
    To avoid the overhead, track AGs with reclaimable inodes in the
    per-ag radix tree so that we can find all the AGs with reclaimable
    inodes via a simple gang tag lookup. This involves setting the tag
    when the first reclaimable inode is tracked in the AG, and removing
    the tag when the last reclaimable inode is removed from the tree.
    Then the summation process becomes a loop walking the radix tree
    summing AGs with the reclaim tag set.
    
    This significantly reduces the overhead of scanning - a 6400 AG
    filesystea now only uses about 25% of a cpu in kswapd while slab
    reclaim progresses instead of being permanently stuck at 100% CPU
    and making little progress. Clean filesystems filesystems will see
    no overhead and the overhead only increases linearly with the number
    of dirty AGs.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
  2. xfs: convert inode shrinker to per-filesystem contexts

    Dave Chinner authored and dchinner committed Jul 19, 2010
    Now the shrinker passes us a context, wire up a shrinker context per
    filesystem. This allows us to remove the global mount list and the
    locking problems that introduced. It also means that a shrinker call
    does not need to traverse clean filesystems before finding a
    filesystem with reclaimable inodes.  This significantly reduces
    scanning overhead when lots of filesystems are present.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
  3. Btrfs: fix checks in BTRFS_IOC_CLONE_RANGE

    djrbliss authored and chrismason-xx committed Jul 19, 2010
    1.  The BTRFS_IOC_CLONE and BTRFS_IOC_CLONE_RANGE ioctls should check
    whether the donor file is append-only before writing to it.
    
    2.  The BTRFS_IOC_CLONE_RANGE ioctl appears to have an integer
    overflow that allows a user to specify an out-of-bounds range to copy
    from the source file (if off + len wraps around).  I haven't been able
    to successfully exploit this, but I'd imagine that a clever attacker
    could use this to read things he shouldn't.  Even if it's not
    exploitable, it couldn't hurt to be safe.
    
    Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
    cc: stable@kernel.org
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  4. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds committed Jul 19, 2010
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, pci, mrst: Add extra sanity check in walking the PCI extended cap chain
      x86: Fix x2apic preenabled system with kexec
      x86: Force HPET readback_cmp for all ATI chipsets
  5. Merge branch 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds committed Jul 19, 2010
    …git/cmarinas/linux-2.6-cm
    
    * 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:
      kmemleak: Add support for NO_BOOTMEM configurations
      kmemleak: Annotate false positive in init_section_page_cgroup()
  6. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds committed Jul 19, 2010
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] cio: fix potential overflow in chpid descriptor
      [S390] add missing device put
      [S390] dasd: use correct label location for diag fba disks
  7. intel_scu_ipc: Oops/crash fixes

    Sreedhara DS authored and torvalds committed Jul 19, 2010
    - fix reversing of command/sub arguments
    - fix a crash if the i2c interface is called before the device is found
    
    Signed-off-by: Sreedhara DS <sreedhara.ds@intel.com>
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. Btrfs: fix CLONE ioctl destination file size expansion to block boundary

    liewegas authored and chrismason-xx committed Jun 12, 2010
    The CLONE and CLONE_RANGE ioctls round up the range of extents being
    cloned to the block size when the range to clone extends to the end of file
    (this is always the case with CLONE).  It was then using that offset when
    extending the destination file's i_size.  Fix this by not setting i_size
    beyond the originally requested ending offset.
    
    This bug was introduced by a22285a (2.6.35-rc1).
    
    Signed-off-by: Sage Weil <sage@newdream.net>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  9. Btrfs: fix split_leaf double split corner case

    chrismason-xx committed Jul 7, 2010
    split_leaf was not properly balancing leaves when it was forced to
    split a leaf twice.  This commit adds an extra push left and right
    before forcing the double split in hopes of getting the slot where
    we want to insert at either the start or end of the leaf.
    
    If the extra pushes do work, then we are able to avoid splitting twice
    and we keep the tree properly balanced.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  10. tcp: fix crash in tcp_xmit_retransmit_queue

    ij1 authored and davem330 committed Jul 19, 2010
    It can happen that there are no packets in queue while calling
    tcp_xmit_retransmit_queue(). tcp_write_queue_head() then returns
    NULL and that gets deref'ed to get sacked into a local var.
    
    There is no work to do if no packets are outstanding so we just
    exit early.
    
    This oops was introduced by 08ebd17 (tcp: remove tp->lost_out
    guard to make joining diff nicer).
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Reported-by: Lennart Schulte <lennart.schulte@nets.rwth-aachen.de>
    Tested-by: Lennart Schulte <lennart.schulte@nets.rwth-aachen.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    davem330 committed Jul 19, 2010
    …t/linville/wireless-2.6
  12. kmemleak: Add support for NO_BOOTMEM configurations

    ctmarinas committed Jul 19, 2010
    With commits 0867721 and 59be5a8, alloc_bootmem()/free_bootmem() and
    friends use the early_res functions for memory management when
    NO_BOOTMEM is enabled. This patch adds the kmemleak calls in the
    corresponding code paths for bootmem allocations.
    
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Acked-by: Yinghai Lu <yinghai@kernel.org>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: stable@kernel.org
  13. kmemleak: Annotate false positive in init_section_page_cgroup()

    ctmarinas committed Jul 19, 2010
    The pointer to the page_cgroup table allocated in
    init_section_page_cgroup() is stored in section->page_cgroup as (base -
    pfn). Since this value does not point to the beginning or inside the
    allocated memory block, kmemleak reports a false positive.
    
    This was reported in bugzilla.kernel.org as #16297.
    
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Reported-by: Adrien Dessemond <adrien.dessemond@gmail.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Pekka Enberg <penberg@cs.helsinki.fi>
    Cc: Andrew Morton <akpm@linux-foundation.org>
  14. [S390] cio: fix potential overflow in chpid descriptor

    sebott authored and Martin Schwidefsky committed Jul 19, 2010
    The length filed in the chsc response block (if valid)
    has a value of n*(sizeof(chp_desc))+8 (for the response
    block header). When we memcopied from the response block
    to the actual descriptor we copied 8 bytes too much.
    The bug was not revealed since the descriptor is embedded
    in struct channel_path.
    Since we only write one descriptor at a time ignore the
    length value and use sizeof(*desc).
    
    Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  15. [S390] add missing device put

    stefan-haberland authored and Martin Schwidefsky committed Jul 19, 2010
    The dasd_alias_show function does not return a device reference
    in case the device is an alias.
    
    Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  16. [S390] dasd: use correct label location for diag fba disks

    oberpar authored and Martin Schwidefsky committed Jul 19, 2010
    Partition boundary calculation fails for DASD FBA disks under the
    following conditions:
    - disk is formatted with CMS FORMAT with a blocksize of more than
      512 bytes
    - all of the disk is reserved to a single CMS file using CMS RESERVE
    - the disk is accessed using the DIAG mode of the DASD driver
    
    Under these circumstances, the partition detection code tries to
    read the CMS label block containing partition-relevant information
    from logical block offset 1, while it is in fact located at physical
    block offset 1.
    
    Fix this problem by using the correct CMS label block location
    depending on the device type as determined by the DASD SENSE ID
    information.
    
    Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  17. mm: add context argument to shrinker callback

    Dave Chinner authored and dchinner committed Jul 19, 2010
    The current shrinker implementation requires the registered callback
    to have global state to work from. This makes it difficult to shrink
    caches that are not global (e.g. per-filesystem caches). Pass the shrinker
    structure to the callback so that users can embed the shrinker structure
    in the context the shrinker needs to operate on and get back to it in the
    callback via container_of().
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
Commits on Jul 18, 2010
  1. Merge branch 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds committed Jul 18, 2010
    …el/git/frob/linux-2.6-roland
    
    * 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
      x86: kprobes: fix swapped segment registers in kretprobe