Permalink
Commits on Jun 21, 2011
  1. Linux 3.0-rc4

    committed Jun 21, 2011
  2. vfs: i_state needs to be 'unsigned long' for now

    Commit 13e12d1 ("vfs: reorganize 'struct inode' layout a bit")
    moved things around a bit changed i_state to be unsigned int instead of
    unsigned long.  That was to help structure layout for the 64-bit case,
    and shrink 'struct inode' a bit (admittedly that only happened when
    spinlock debugging was on and i_flags didn't pack with i_lock).
    
    However, Meelis Roos reports that this results in unaligned exceptions
    on sprc, and it turns out that the bit-locking primitives that we use
    for the I_NEW bit want to use the bitops.  Which want 'unsigned long',
    not 'unsigned int'.
    
    We really should fix the bit locking code to not have that kind of
    requirement, but that's a much bigger change.  So for now, revert that
    field back to 'unsigned long' (but keep the other re-ordering changes
    from the commit that caused this).
    
    Andi points out that we have played games with this in 'struct page', so
    it's solvable with other hacks too, but since right now the struct inode
    size advantage only happens with some rare config options, it's not
    worth fighting.
    
    It _would_ be worth fixing the bitlocking code, though.  Especially
    since there is no type safety in the bitlocking code (this never caused
    any warnings, and worked fine on x86-64, because the bitlocks take a
    'void *' and x86-64 doesn't care that deeply about alignment).  So it's
    currently a very easy problem to trigger by mistake and never notice.
    
    Reported-by: Meelis Roos <mroos@linux.ee>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: David Miller <davem@davemloft.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    committed Jun 21, 2011
  3. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms/r6xx+: voltage fixes
      drm/nouveau: drop leftover debugging
      drm/radeon: avoid warnings from r600/eg irq handlers on powered off card.
      drm/radeon/kms: add missing param for dce3.2 DP transmitter setup
      drm/radeon/kms/atom: fix duallink on some early DCE3.2 cards
      drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan sync
      drm/nv50/disp: fix gamma with page flipping overlay turned on
      drm/nouveau/pm: Prevent overflow in nouveau_perf_init()
      drm/nouveau: fix big-endian switch
    committed Jun 21, 2011
  4. Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/lin…

    …ux-msm
    
    * 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
      msm: timer: Fix DGT rate on 8960 and 8660
      msm: timer: compensate for timer shift in msm_read_timer_count
      msm: timer: Fix SMP build error
    committed Jun 21, 2011
  5. Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux

    * 'for-2.6.40' of git://linux-nfs.org/~bfields/linux:
      nfsd4: fix break_lease flags on nfsd open
      nfsd: link returns nfserr_delay when breaking lease
      nfsd: v4 support requires CRYPTO
      nfsd: fix dependency of nfsd on auth_rpcgss
    committed Jun 21, 2011
  6. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)
      pxa168_eth: fix race in transmit path.
      ipv4, ping: Remove duplicate icmp.h include
      netxen: fix race in skb->len access
      sgi-xp: fix a use after free
      hp100: fix an skb->len race
      netpoll: copy dev name of slaves to struct netpoll
      ipv4: fix multicast losses
      r8169: fix static initializers.
      inet_diag: fix inet_diag_bc_audit()
      gigaset: call module_put before restart of if_open()
      farsync: add module_put to error path in fst_open()
      net: rfs: enable RFS before first data packet is received
      fs_enet: fix freescale FCC ethernet dp buffer alignment
      netdev: bfin_mac: fix memory leak when freeing dma descriptors
      vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support
      caif: Bugfix - XOFF removed channel from caif-mux
      tun: teach the tun/tap driver to support netpoll
      dp83640: drop PHY status frames in the driver.
      dp83640: fix phy status frame event parsing
      phylib: Allow BCM63XX PHY to be selected only on BCM63XX.
      ...
    committed Jun 21, 2011
  7. 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:
      devcgroup_inode_permission: take "is it a device node" checks to inlined wrapper
      fix comment in generic_permission()
      kill obsolete comment for follow_down()
      proc_sys_permission() is OK in RCU mode
      reiserfs_permission() doesn't need to bail out in RCU mode
      proc_fd_permission() is doesn't need to bail out in RCU mode
      nilfs2_permission() doesn't need to bail out in RCU mode
      logfs doesn't need ->permission() at all
      coda_ioctl_permission() is safe in RCU mode
      cifs_permission() doesn't need to bail out in RCU mode
      bad_inode_permission() is safe from RCU mode
      ubifs: dereferencing an ERR_PTR in ubifs_mount()
    committed Jun 21, 2011
Commits on Jun 20, 2011
  1. drm/radeon/kms/r6xx+: voltage fixes

    0xff01 is not an actual voltage value, but a flag
    for the driver.  If the power state as that value,
    skip setting the voltage.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Jun 20, 2011
  2. @bebarino

    msm: timer: Fix DGT rate on 8960 and 8660

    The DGT runs at 27 MHz divided by 4 on 8660 and 8960.
    
    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    Signed-off-by: David Brown <davidb@codeaurora.org>
    bebarino committed with David Brown Apr 21, 2011
  3. @richardcochran @davem330

    pxa168_eth: fix race in transmit path.

    Because the socket buffer is freed in the completion interrupt, it is not
    safe to access it after submitting it to the hardware.
    
    Cc: stable@kernel.org
    Cc: Sachin Sanap <ssanap@marvell.com>
    Cc: Zhangfei Gao <zgao6@marvell.com>
    Cc: Philip Rakity <prakity@marvell.com>
    Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    richardcochran committed with davem330 Jun 19, 2011
  4. @jjuhl @davem330

    ipv4, ping: Remove duplicate icmp.h include

    Remove the duplicate inclusion of net/icmp.h from net/ipv4/ping.c
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    jjuhl committed with davem330 Jun 19, 2011
  5. @davem330

    netxen: fix race in skb->len access

    As soon as skb is given to hardware, TX completion can free skb under
    us.
    Therefore, we should update dev stats before kicking the device.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Eric Dumazet committed with davem330 Jun 19, 2011
  6. Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/konrad/xen
    
    * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/setup: Fix for incorrect xen_extra_mem_start.
      xen: When calling power_off, don't call the halt function.
      xen: Fix compile warning when CONFIG_SMP is not defined.
      xen: support CONFIG_MAXSMP
      xen: partially revert "xen: set max_pfn_mapped to the last pfn mapped"
    committed Jun 20, 2011
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: sh_keysc - 8x8 MODE_6 fix
      Input: omap-keypad - add missing input_sync()
      Input: evdev - try to wake up readers only if we have full packet
      Input: properly assign return value of clamp() macro.
    committed Jun 20, 2011
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: avoid delayed metadata items during commits
      btrfs: fix uninitialized return value
      btrfs: fix wrong reservation when doing delayed inode operations
      btrfs: Remove unused sysfs code
      btrfs: fix dereference of ERR_PTR value
      Btrfs: fix relocation races
      Btrfs: set no_trans_join after trying to expand the transaction
      Btrfs: protect the pending_snapshots list with trans_lock
      Btrfs: fix path leakage on subvol deletion
      Btrfs: drop the delalloc_bytes check in shrink_delalloc
      Btrfs: check the return value from set_anon_super
    committed Jun 20, 2011
  9. Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/k…

    …vm/kvm
    
    * 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: Fix register corruption in pvclock_scale_delta
      KVM: MMU: fix opposite condition in mapping_level_dirty_bitmap
      KVM: VMX: do not overwrite uptodate vcpu->arch.cr3 on KVM_SET_SREGS
      KVM: MMU: Fix build warnings in walk_addr_generic()
    committed Jun 20, 2011
  10. devcgroup_inode_permission: take "is it a device node" checks to inli…

    …ned wrapper
    
    inode_permission() calls devcgroup_inode_permission() and almost all such
    calls are _not_ for device nodes; let's at least keep the common path
    straight...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  11. fix comment in generic_permission()

    CAP_DAC_OVERRIDE is enough for MAY_EXEC on directory, even if
    no exec bits are set.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  12. kill obsolete comment for follow_down()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 17, 2011
  13. proc_sys_permission() is OK in RCU mode

    nothing blocking there, since all instances of sysctl
    ->permissions() method are non-blocking - both of them,
    that is.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  14. reiserfs_permission() doesn't need to bail out in RCU mode

    nothing blocking other than generic_permission() (and
    check_acl callback does bail out in RCU mode).
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  15. proc_fd_permission() is doesn't need to bail out in RCU mode

    nothing blocking except generic_permission()
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  16. nilfs2_permission() doesn't need to bail out in RCU mode

    Nothing blocking except for generic_permission().  Which will DTRT.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  17. logfs doesn't need ->permission() at all

    ... and never did, what with its ->permission() being what we do by default
    when ->permission is NULL...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  18. coda_ioctl_permission() is safe in RCU mode

    return (mask & MAY_EXEC) ? -EACCES : 0; is non-blocking...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  19. cifs_permission() doesn't need to bail out in RCU mode

    nothing potentially blocking except generic_permission(), which
    will DTRT
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 19, 2011
  20. bad_inode_permission() is safe from RCU mode

    return -EIO; is *not* a blocking operation, thank you very much.
    Nick, what the hell have you been smoking?
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 18, 2011
  21. @error27

    ubifs: dereferencing an ERR_PTR in ubifs_mount()

    d251ed2 "ubifs: fix sget races" left out the goto from this
    error path so the static checkers complain that we're dereferencing
    "sb" when it's an ERR_PTR.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    error27 committed with Al Viro Jun 20, 2011
  22. nfsd4: fix break_lease flags on nfsd open

    Thanks to Casey Bodley for pointing out that on a read open we pass 0,
    instead of O_RDONLY, to break_lease, with the result that a read open is
    treated like a write open for the purposes of lease breaking!
    
    Reported-by: Casey Bodley <cbodley@citi.umich.edu>
    Cc: stable@kernel.org
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    J. Bruce Fields committed Jun 7, 2011
  23. drm/nouveau: drop leftover debugging

    this printk isn't really useful, just drop it for now.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Jun 20, 2011
  24. Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git…

    …/nouveau/linux-2.6 into drm-fixes
    
    * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
      drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan sync
      drm/nv50/disp: fix gamma with page flipping overlay turned on
      drm/nouveau/pm: Prevent overflow in nouveau_perf_init()
      drm/nouveau: fix big-endian switch
    Dave Airlie committed Jun 20, 2011
  25. drm/radeon: avoid warnings from r600/eg irq handlers on powered off c…

    …ard.
    
    Since we were calling the wptr function before checking if the IH was
    even enabled, or the GPU wasn't shutdown, we'd get spam in the logs when
    the GPU readback 0xffffffff. This reorders things so we return early
    in the no IH and GPU shutdown cases.
    
    Reported-and-tested-by: ManDay on #radeon
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Jun 18, 2011
Commits on Jun 19, 2011
  1. drm/radeon/kms: add missing param for dce3.2 DP transmitter setup

    This is used during phy init to set up the phy for DP.  This may
    fix DP problems on DCE3.2 cards.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Jun 17, 2011
  2. drm/radeon/kms/atom: fix duallink on some early DCE3.2 cards

    Certain revisions of the vbios on DCE3.2 cards have a bug
    in the transmitter control table which prevents duallink from
    being enabled properly on some cards.  The action switch statement
    jumps to the wrong offset for the OUTPUT_ENABLE action.  The fix
    is to use the ENABLE action rather than the OUTPUT_ENABLE action
    on the affected cards.  In fixed version of the vbios, both
    actions jump to the same offset, so the change should be safe.
    
    Reported-and-tested-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Jun 17, 2011
  3. @davem330

    sgi-xp: fix a use after free

    Its illegal to dereference skb after dev_kfree_skb(skb)
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    CC: Robin Holt <holt@sgi.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Eric Dumazet committed with davem330 Jun 19, 2011