1. 31 3月, 2011 29 次提交
  2. 30 3月, 2011 9 次提交
  3. 29 3月, 2011 2 次提交
    • D
      fs: don't use igrab() while holding i_lock · 0444d76a
      Dave Chinner 提交于
      Fix the incorrect use of igrab() inside the i_lock in NFS and Ceph‥
      
      If we are already holding the i_lock, we have a reference to the
      inode so we can safely use ihold() to gain an extra reference. This
      avoids hangs due to lock recursion on the i_lock now that the
      inode_lock is gone and igrab() uses the i_lock itself.
      Signed-off-by: NDave Chinner <dchinner@redhat.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: linux-fsdevel@vger.kernel.org
      Cc: Ryan Mallon <ryan@bluewatersys.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0444d76a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · cb1817b3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
        xfrm: Restrict extended sequence numbers to esp
        xfrm: Check for esn buffer len in xfrm_new_ae
        xfrm: Assign esn pointers when cloning a state
        xfrm: Move the test on replay window size into the replay check functions
        netdev: bfin_mac: document TE setting in RMII modes
        drivers net: Fix declaration ordering in inline functions.
        cxgb3: Apply interrupt coalescing settings to all queues
        net: Always allocate at least 16 skb frags regardless of page size
        ipv4: Don't ip_rt_put() an error pointer in RAW sockets.
        net: fix ethtool->set_flags not intended -EINVAL return value
        mlx4_en: Fix loss of promiscuity
        tg3: Fix inline keyword usage
        tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h>
        net: use CHECKSUM_NONE instead of magic number
        Net / jme: Do not use legacy PCI power management
        myri10ge: small rx_done refactoring
        bridge: notify applications if address of bridge device changes
        ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo()
        can: c_can: Fix tx_bytes accounting
        can: c_can_platform: fix irq check in probe
        ...
      cb1817b3