Permalink
Switch branches/tags
Commits on Feb 9, 2010
  1. Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

    * 'for-2.6.33' of git://linux-nfs.org/~bfields/linux:
      Revert "nfsd4: fix error return when pseudoroot missing"
    torvalds committed Feb 9, 2010
  2. Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/jlbec/ocfs2
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2/cluster: Make o2net connect messages KERN_NOTICE
      ocfs2/dlm: Fix printing of lockname
      ocfs2: Fix contiguousness check in ocfs2_try_to_merge_extent_map()
      ocfs2/dlm: Remove BUG_ON in dlm recovery when freeing locks of a dead node
      ocfs2: Plugs race between the dc thread and an unlock ast message
      ocfs2: Remove overzealous BUG_ON during blocked lock processing
      ocfs2: Do not downconvert if the lock level is already compatible
      ocfs2: Prevent a livelock in dlmglue
      ocfs2: Fix setting of OCFS2_LOCK_BLOCKED during bast
      ocfs2: Use compat_ptr in reflink_arguments.
      ocfs2/dlm: Handle EAGAIN for compatibility - v2
      ocfs2: Add parenthesis to wrap the check for O_DIRECT.
      ocfs2: Only bug out when page size is larger than cluster size.
      ocfs2: Fix memory overflow in cow_by_page.
      ocfs2/dlm: Print more messages during lock migration
      ocfs2/dlm: Ignore LVBs of locks in the Blocked list
      ocfs2/trivial: Remove trailing whitespaces
      ocfs2: fix a misleading variable name
      ocfs2: Sync max_inline_data_with_xattr from tools.
      ocfs2: Fix refcnt leak on ocfs2_fast_follow_link() error path
    torvalds committed Feb 9, 2010
Commits on Feb 8, 2010
  1. Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/davej/cpufreq
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] Fix ondemand to not request targets outside policy limits
      [CPUFREQ] Fix use after free of struct powernow_k8_data
      [CPUFREQ] fix default value for ondemand governor
    torvalds committed Feb 8, 2010
  2. ocfs2/cluster: Make o2net connect messages KERN_NOTICE

    Connect and disconnect messages are more than informational as they are required
    during root cause analysis for failures. This patch changes them from KERN_INFO
    to KERN_NOTICE.
    
    Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
    Acked-by: Mark Faseh <mfasheh@suse.com>
    Signed-off-by: Joel Becker <joel.becker@oracle.com>
    Sunil Mushran committed with Joel Becker Feb 5, 2010
  3. ocfs2/dlm: Fix printing of lockname

    The debug call printing the name of the lock resource was chopping
    off the last character. This patch fixes the problem.
    
    Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
    Acked-by: Mark Fasheh <mfasheh@suse.com>
    Signed-off-by: Joel Becker <joel.becker@oracle.com>
    Sunil Mushran committed with Joel Becker Feb 6, 2010
  4. Revert "nfsd4: fix error return when pseudoroot missing"

    Commit f39bde2 fixed the error return from PUTROOTFH in the
    case where there is no pseudofilesystem.
    
    This is really a case we shouldn't hit on a correctly configured server:
    in the absence of a root filehandle, there's no point accepting version
    4 NFS rpc calls at all.
    
    But the shared responsibility between kernel and userspace here means
    the kernel on its own can't eliminate the possiblity of this happening.
    And we have indeed gotten this wrong in distro's, so new client-side
    mount code that attempts to negotiate v4 by default first has to work
    around this case.
    
    Therefore when commit f39bde2 arrived at roughly the same
    time as the new v4-default mount code, which explicitly checked only for
    the previous error, the result was previously fine mounts suddenly
    failing.
    
    We'll fix both sides for now: revert the error change, and make the
    client-side mount workaround more robust.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    J. Bruce Fields committed Feb 8, 2010
  5. Merge branch 'v4l_for_linus' of git://linuxtv.org/fixes

    * 'v4l_for_linus' of git://linuxtv.org/fixes:
      V4L/DVB: dvb-core: fix initialization of feeds list in demux filter
      V4L/DVB: dvb_demux: Don't use vmalloc at dvb_dmx_swfilter_packet
      V4L/DVB: Fix the risk of an oops at dvb_dmx_release
    torvalds committed Feb 8, 2010
  6. Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

    * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
      microblaze: Invalidate dcache before enabling it
    torvalds committed Feb 8, 2010
  7. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc/pseries: Fix kexec regression caused by CPPR tracking
    torvalds committed Feb 8, 2010
  8. Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/lethal/sh-2.6
    
    * 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Remove superfluous setup_frame_reg call
      sh: Don't continue unwinding across interrupts
      sh: Setup frame pointer in handle_exception path
      sh: Correct the offset of the return address in ret_from_exception
      usb: r8a66597-hcd: Fix up spinlock recursion in root hub polling.
      usb: r8a66597-hcd: Flush the D-cache for the pipe-in transfer buffers.
    torvalds committed Feb 8, 2010
  9. V4L/DVB: dvb-core: fix initialization of feeds list in demux filter

    A DVB demultiplexer device can be used to set up either a PES filter or
    a section filter. In the former case, the ts field of the feed union of
    struct dmxdev_filter is used, in the latter case the sec field of the
    same union is used.
    The ts field is a struct list_head, and is currently initialized in the
    open() method of the demux device. When for a given demuxer a section
    filter is set up, the sec field is played with, thus if a PES filter
    needs to be set up after that the ts field will be corrupted, causing a
    kernel oops.
    This fix moves the list head initialization to
    dvb_dmxdev_pes_filter_set(), so that the ts field is properly
    initialized every time a PES filter is set up.
    
    Signed-off-by: Francesco Lavra <francescolavra@interfree.it>
    Cc: stable <stable@kernel.org>
    Reviewed-by: Andy Walls <awalls@radix.net>
    Tested-by: hermann pitton <hermann-pitton@arcor.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Francesco Lavra committed with Mauro Carvalho Chehab Feb 7, 2010
  10. V4L/DVB: dvb_demux: Don't use vmalloc at dvb_dmx_swfilter_packet

    As dvb_dmx_swfilter_packet() is protected by a spinlock, it shouldn't sleep.
    However, vmalloc() may call sleep. So, move the initialization of
    dvb_demux::cnt_storage field to a better place.
    
    Reviewed-by: Andy Walls <awalls@radix.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Mauro Carvalho Chehab committed Feb 1, 2010
  11. V4L/DVB: Fix the risk of an oops at dvb_dmx_release

    dvb_dmx_init tries to allocate virtual memory for 2 pointers: filter and feed.
    
    If the second vmalloc fails, filter is freed, but the pointer keeps pointing
    to the old place. Later, when dvb_dmx_release() is called, it will try to
    free an already freed memory, causing an OOPS.
    
    Reviewed-by: Andy Walls <awalls@radix.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Mauro Carvalho Chehab committed Feb 1, 2010
  12. microblaze: Invalidate dcache before enabling it

    We found that on write-trough kernel is necessary to do that invalidation.
    One WB is possible to use invalidation too.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Feb 1, 2010
  13. powerpc/pseries: Fix kexec regression caused by CPPR tracking

    The code to track the CPPR values added by commit
    49bd364 ("powerpc/pseries: Track previous
    CPPR values to correctly EOI interrupts") broke kexec on pseries because
    the kexec code in xics.c calls xics_set_cpu_priority() before the IPI has
    been EOI'ed. This wasn't a problem previously but it now triggers a BUG_ON
    in xics_set_cpu_priority() because os_cppr->index isn't 0.
    
    Fix this problem by setting the index on the CPPR stack to 0 before calling
    xics_set_cpu_priority() in xics_teardown_cpu().
    
    Also make it clear that we only want to set the priority when there's just
    one CPPR value in the stack, and enforce it by updating the value of
    os_cppr->stack[0] rather than os_cppr->stack[os_cppr->index].
    
    While we're at it change the BUG_ON to a WARN_ON.
    
    Reported-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Mark Nelson <markn@au1.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Mark Nelson committed with ozbenh Feb 7, 2010
  14. sh: Remove superfluous setup_frame_reg call

    There's no need to setup the frame pointer again in
    call_handle_tlbmiss. The frame pointer will already have been setup in
    handle_interrupt.
    
    Signed-off-by: Matt Fleming <matt@console-pimps.org>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    mfleming committed with Paul Mundt Jan 30, 2010
  15. sh: Don't continue unwinding across interrupts

    Unfortunately, due to poor DWARF info in current toolchains, unwinding
    through interrutps cannot be done reliably. The problem is that the
    DWARF info for function epilogues is wrong.
    
    Take this standard epilogue sequence,
    
    80003cc4:       e3 6f           mov     r14,r15
    80003cc6:       26 4f           lds.l   @r15+,pr
    80003cc8:       f6 6e           mov.l   @r15+,r14
    						<---- interrupt here
    80003cca:       f6 6b           mov.l   @r15+,r11
    80003ccc:       f6 6a           mov.l   @r15+,r10
    80003cce:       f6 69           mov.l   @r15+,r9
    80003cd0:       0b 00           rts
    
    If we take an interrupt at the highlighted point, the DWARF info will
    bogusly claim that the return address can be found at some offset from
    the frame pointer, even though the frame pointer was just restored. The
    worst part is if the unwinder finds a text address at the bogus stack
    address - unwinding will continue, for a bit, until it finally comes
    across an unexpected address on the stack and blows up.
    
    The only solution is to stop unwinding once we've calculated the
    function that was executing when the interrupt occurred. This PC can be
    easily calculated from pt_regs->pc.
    
    Signed-off-by: Matt Fleming <matt@console-pimps.org>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    mfleming committed with Paul Mundt Jan 30, 2010
  16. sh: Setup frame pointer in handle_exception path

    In order to allow the DWARF unwinder to unwind through exceptions we
    need to setup the frame pointer register (r14).
    
    Signed-off-by: Matt Fleming <matt@console-pimps.org>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    mfleming committed with Paul Mundt Jan 27, 2010
  17. sh: Correct the offset of the return address in ret_from_exception

    The address that ret_from_exception and ret_from_irq will return to is
    found in the stack slot for SPC, not PR. This error was causing the
    DWARF unwinder to pick up the wrong return address on the stack and then
    unwind using the unwind tables for the wrong function.
    
    While I'm here I might as well add CFI annotations for the other
    registers since they could be useful when unwinding.
    
    Signed-off-by: Matt Fleming <matt@console-pimps.org>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    mfleming committed with Paul Mundt Jan 27, 2010
Commits on Feb 7, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      Take ima_file_free() to proper place.
      ima: rename PATH_CHECK to FILE_CHECK
      ima: rename ima_path_check to ima_file_check
      ima: initialize ima before inodes can be allocated
      fix ima breakage
      Take ima_path_check() in nfsd past dentry_open() in nfsd_open()
      freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb
      befs: fix leak
    torvalds committed Feb 7, 2010
  2. Fix race in tty_fasync() properly

    This reverts commit 7036251 ("tty: fix race in tty_fasync") and
    commit b04da8b ("fnctl: f_modown should call write_lock_irqsave/
    restore") that tried to fix up some of the fallout but was incomplete.
    
    It turns out that we really cannot hold 'tty->ctrl_lock' over calling
    __f_setown, because not only did that cause problems with interrupt
    disables (which the second commit fixed), it also causes a potential
    ABBA deadlock due to lock ordering.
    
    Thanks to Tetsuo Handa for following up on the issue, and running
    lockdep to show the problem.  It goes roughly like this:
    
     - f_getown gets filp->f_owner.lock for reading without interrupts
       disabled, so an interrupt that happens while that lock is held can
       cause a lockdep chain from f_owner.lock -> sighand->siglock.
    
     - at the same time, the tty->ctrl_lock -> f_owner.lock chain that
       commit 7036251 introduced, together with the pre-existing
       sighand->siglock -> tty->ctrl_lock chain means that we have a lock
       dependency the other way too.
    
    So instead of extending tty->ctrl_lock over the whole __f_setown() call,
    we now just take a reference to the 'pid' structure while holding the
    lock, and then release it after having done the __f_setown.  That still
    guarantees that 'struct pid' won't go away from under us, which is all
    we really ever needed.
    
    Reported-and-tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Acked-by: Américo Wang <xiyou.wangcong@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Feb 7, 2010
  3. Take ima_file_free() to proper place.

    Hooks: Just Say No.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Feb 7, 2010
  4. ima: rename PATH_CHECK to FILE_CHECK

    With the movement of the ima hooks functions were renamed from *path* to
    *file* since they always deal with struct file.  This patch renames some of
    the ima internal flags to make them consistent with the rest of the code.
    
    Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Mimi Zohar committed with Al Viro Jan 26, 2010
  5. ima: rename ima_path_check to ima_file_check

    ima_path_check actually deals with files!  call it ima_file_check instead.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Mimi Zohar committed with Al Viro Jan 26, 2010
  6. ima: initialize ima before inodes can be allocated

    ima wants to create an inode information struct (iint) when inodes are
    allocated.  This means that at least the part of ima which does this
    allocation (the allocation is filled with information later) should
    before any inodes are created.  To accomplish this we split the ima
    initialization routine placing the kmem cache allocator inside a
    security_initcall() function.  Since this makes use of radix trees we also
    need to make sure that is initialized before security_initcall().
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    eparis committed with Al Viro Dec 9, 2009
  7. fix ima breakage

    The "Untangling ima mess, part 2 with counters" patch messed
    up the counters.  Based on conversations with Al Viro, this patch
    streamlines ima_path_check() by removing the counter maintaince.
    The counters are now updated independently, from measuring the file,
    in __dentry_open() and alloc_file() by calling ima_counts_get().
    ima_path_check() is called from nfsd and do_filp_open().
    It also did not measure all files that should have been measured.
    Reason: ima_path_check() got bogus value passed as mask.
    [AV: mea culpa]
    [AV: add missing nfsd bits]
    
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Mimi Zohar committed with Al Viro Jan 20, 2010
  8. Take ima_path_check() in nfsd past dentry_open() in nfsd_open()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jan 26, 2010
  9. freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb

    Thanks Thomas and Christoph for testing and review.
    I removed 'smp_wmb()' before up_write from the previous patch,
    since up_write() should have necessary ordering constraints.
    (I.e. the change of s_frozen is visible to others after up_write)
    I'm quite sure the change is harmless but if you are uncomfortable
    with Tested-by/Reviewed-by on the modified patch, please remove them.
    
    If MS_RDONLY, freeze_bdev should just up_write(s_umount) instead of
    deactivate_locked_super().
    Also, keep sb->s_frozen consistent so that remount can check the frozen state.
    
    Otherwise a crash reported here can happen:
    http://lkml.org/lkml/2010/1/16/37
    http://lkml.org/lkml/2010/1/28/53
    
    This patch should be applied for 2.6.32 stable series, too.
    
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Tested-by: Thomas Backlund <tmb@mandriva.org>
    Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
    Cc: stable@kernel.org
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Jun'ichi Nomura committed with Al Viro Jan 29, 2010
  10. befs: fix leak

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jan 29, 2010
Commits on Feb 6, 2010
  1. Linux 2.6.33-rc7

    torvalds committed Feb 6, 2010
  2. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (w83781d) Request I/O ports individually for probing
      hwmon: (lm78) Request I/O ports individually for probing
      hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT
    torvalds committed Feb 6, 2010
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: Fix leak of relocs along do_execbuffer error path
      drm/i915: slow acpi_lid_open() causes flickering - V2
      drm/i915: Disable SR when more than one pipe is enabled
      drm/i915: page flip support for Ironlake
      drm/i915: Fix the incorrect DMI string for Samsung SX20S laptop
      drm/i915: Add support for SDVO composite TV
      drm/i915: don't trigger ironlake vblank interrupt at irq install
      drm/i915: handle non-flip pending case when unpinning the scanout buffer
      drm/i915: Fix the device info of Pineview
      drm/i915: enable vblank interrupt on ironlake
      drm/i915: Prevent use of uninitialized pointers along error path.
      drm/i915: disable hotplug detect before Ironlake CRT detect
    torvalds committed Feb 6, 2010
  4. Fix potential crash with sys_move_pages

    We incorrectly depended on the 'node_state/node_isset()' functions
    testing the node range, rather than checking it explicitly.  That's not
    reliable, even if it might often happen to work.  So do the proper
    explicit test.
    
    Reported-by: Marcus Meissner <meissner@suse.de>
    Acked-and-tested-by: Brice Goglin <Brice.Goglin@inria.fr>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Feb 6, 2010
Commits on Feb 5, 2010
  1. ocfs2: Fix contiguousness check in ocfs2_try_to_merge_extent_map()

    The wrong member was compared in the continguousness check.
    
    Acked-by: Tao Ma <tao.ma@oracle.com>
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Joel Becker <joel.becker@oracle.com>
    RoelKluin committed with Joel Becker Feb 5, 2010
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: pandora: Add APLL supply to fix audio output
      ALSA: ice1724 - aureon - fix wm8770 volume offset
      ALSA: cosmetic: make hda intel interrupt name consistent with others
      ALSA: hda - Delay switching to polling mode if an interrupt was missing
      ALSA: ctxfi - fix PTP address initialization
    torvalds committed Feb 5, 2010