13 Jan, 2011

9 commits


12 Jan, 2011

31 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (67 commits)
    cxgb4vf: recover from failure in cxgb4vf_open()
    netfilter: ebtables: make broute table work again
    netfilter: fix race in conntrack between dump_table and destroy
    ah: reload pointers to skb data after calling skb_cow_data()
    ah: update maximum truncated ICV length
    xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC
    ehea: Increase the skb array usage
    net/fec: remove config FEC2 as it's used nowhere
    pcnet_cs: add new_id
    tcp: disallow bind() to reuse addr/port
    net/r8169: Update the function of parsing firmware
    net: ppp: use {get,put}_unaligned_be{16,32}
    CAIF: Fix IPv6 support in receive path for GPRS/3G
    arp: allow to invalidate specific ARP entries
    net_sched: factorize qdisc stats handling
    mlx4: Call alloc_etherdev to allocate RX and TX queues
    net: Add alloc_netdev_mqs function
    caif: don't set connection request param size before copying data
    cxgb4vf: fix mailbox data/control coherency domain race
    qlcnic: change module parameter permissions
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    sparc64: Fix bootup regression due to perf init ordering.

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)
    powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
    powerpc/pseries: Fix VPHN build errors on non-SMP systems
    powerpc/83xx: add mpc8308_p1m DMA controller device-tree node
    powerpc/83xx: add DMA controller to mpc8308 device-tree node
    powerpc/512x: try to free dma descriptors in case of allocation failure
    powerpc/512x: add MPC8308 dma support
    powerpc/512x: fix the hanged dma transfer issue
    powerpc/512x: scatter/gather dma fix
    powerpc/powermac: Make auto-loading of therm_pm72 possible
    of/address: Use propper endianess in get_flags
    powerpc/pci: Use printf extension %pR for struct resource
    powerpc: Remove unnecessary casts of void ptr
    powerpc: Disable VPHN polling during a suspend operation
    powerpc/pseries: Poll VPA for topology changes and update NUMA maps
    powerpc: iommu: Add device name to iommu error printks
    powerpc: Record vma->phys_addr in ioremap()
    powerpc: Update compat_arch_ptrace
    powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
    powerpc/time: printk time stamp init not correct
    powerpc: Minor cleanups for machdep.h
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (42 commits)
    IB/qib: Fix refcount leak in lkey/rkey validation
    IB/qib: Improve SERDES tunning on QMH boards
    IB/qib: Unnecessary delayed completions on RC connection
    IB/qib: Issue pre-emptive NAKs on eager buffer overflow
    IB/qib: RDMA lkey/rkey validation is inefficient for large MRs
    IB/qib: Change QPN increment
    IB/qib: Add fix missing from earlier patch
    IB/qib: Change receive queue/QPN selection
    IB/qib: Fix interrupt mitigation
    IB/qib: Avoid duplicate writes to the rcv head register
    IB/qib: Add a few new SERDES tunings
    IB/qib: Reset packet list after freeing
    IB/qib: New SERDES init routine and improvements to SI quality
    IB/qib: Clear WAIT_SEND flags when setting QP to error state
    IB/qib: Fix context allocation with multiple HCAs
    IB/qib: Fix multi-Florida HCA host panic on reboot
    IB/qib: Handle transitions from ACTIVE_DEFERRED to ACTIVE better
    IB/qib: UD send with immediate receive completion has wrong size
    IB/qib: Set port physical state even if other fields are invalid
    IB/qib: Generate completion callback on errors
    ...

    Linus Torvalds
     
  • Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • If the Link Start fails in cxgb4vf_open(), we need to back out any state
    that we've built up ...

    Signed-off-by: Casey Leedom
    Signed-off-by: David S. Miller

    Casey Leedom
     
  • David S. Miller
     
  • * 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (89 commits)
    NFS fix the setting of exchange id flag
    NFS: Don't use vm_map_ram() in readdir
    NFSv4: Ensure continued open and lockowner name uniqueness
    NFS: Move cl_delegations to the nfs_server struct
    NFS: Introduce nfs_detach_delegations()
    NFS: Move cl_state_owners and related fields to the nfs_server struct
    NFS: Allow walking nfs_client.cl_superblocks list outside client.c
    pnfs: layout roc code
    pnfs: update nfs4_callback_recallany to handle layouts
    pnfs: add CB_LAYOUTRECALL handling
    pnfs: CB_LAYOUTRECALL xdr code
    pnfs: change lo refcounting to atomic_t
    pnfs: check that partial LAYOUTGET return is ignored
    pnfs: add layout to client list before sending rpc
    pnfs: serialize LAYOUTGET(openstateid)
    pnfs: layoutget rpc code cleanup
    pnfs: change how lsegs are removed from layout list
    pnfs: change layout state seqlock to a spinlock
    pnfs: add prefix to struct pnfs_layout_hdr fields
    pnfs: add prefix to struct pnfs_layout_segment fields
    ...

    Linus Torvalds
     
  • broute table init hook sets up the "br_should_route_hook" pointer,
    which then gets called from br_input.

    commit a386f99025f13b32502fe5dedf223c20d7283826
    (bridge: add proper RCU annotation to should_route_hook)
    introduced a typedef, and then changed this to:

    br_should_route_hook_t *rhook;
    [..]
    rhook = rcu_dereference(br_should_route_hook);
    if (*rhook(skb))

    problem is that "br_should_route_hook" contains the address of the function,
    so calling *rhook() results in kernel panic.

    Signed-off-by: Florian Westphal
    Acked-by: Eric Dumazet
    Signed-off-by: Pablo Neira Ayuso

    Florian Westphal
     
  • The netlink interface to dump the connection tracking table has a race
    when entries are deleted at the same time. A customer reported a crash
    and the backtrace showed thatctnetlink_dump_table was running while a
    conntrack entry was being destroyed.
    (see https://bugzilla.vyatta.com/show_bug.cgi?id=6402).

    According to RCU documentation, when using hlist_nulls the reader
    must handle the case of seeing a deleted entry and not proceed
    further down the linked list. The old code would continue
    which caused the scan to walk into the free list.

    This patch uses locking (rather than RCU) for this operation which
    is guaranteed safe, and no longer requires getting reference while
    doing dump operation.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Pablo Neira Ayuso

    Stephen Hemminger
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
    UDF: Close small mem leak in udf_find_entry()
    udf: Fix directory corruption after extent merging
    udf: Protect udf_file_aio_write from possible races
    udf: Remove unnecessary bkl usages
    udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
    udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct
    udf: Remove BKL from free space counting functions
    udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks()
    udf: Remove BKL from udf_put_super() and udf_remount_fs()
    udf: Protect default inode credentials by rwlock
    udf: Protect all modifications of LVID with s_alloc_mutex
    udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex
    udf: Remove BKL from udf_update_inode
    udf: Convert UDF_SB(sb)->s_flags to use bitops
    fs/udf: Add printf format/argument verification
    fs/udf: Use vzalloc

    (Evil merge: this also removes the BKL dependency from the Kconfig file)

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (44 commits)
    ext4: fix trimming starting with block 0 with small blocksize
    ext4: revert buggy trim overflow patch
    ext4: don't pass entire map to check_eofblocks_fl
    ext4: fix memory leak in ext4_free_branches
    ext4: remove ext4_mb_return_to_preallocation()
    ext4: flush the i_completed_io_list during ext4_truncate
    ext4: add error checking to calls to ext4_handle_dirty_metadata()
    ext4: fix trimming of a single group
    ext4: fix uninitialized variable in ext4_register_li_request
    ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary
    ext4: drop i_state_flags on architectures with 64-bit longs
    ext4: reorder ext4_inode_info structure elements to remove unneeded padding
    ext4: drop ec_type from the ext4_ext_cache structure
    ext4: use ext4_lblk_t instead of sector_t for logical blocks
    ext4: replace i_delalloc_reserved_flag with EXT4_STATE_DELALLOC_RESERVED
    ext4: fix 32bit overflow in ext4_ext_find_goal()
    ext4: add more error checks to ext4_mkdir()
    ext4: ext4_ext_migrate should use NULL not 0
    ext4: Use ext4_error_file() to print the pathname to the corrupted inode
    ext4: use IS_ERR() to check for errors in ext4_error_file
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
    ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG
    ext3: Remove redundant unlikely()
    ext2: Remove redundant unlikely()
    ext3: speed up file creates by optimizing rec_len functions
    ext2: speed up file creates by optimizing rec_len functions
    ext3: Add more journal error check
    ext3: Add journal error check in resize.c
    quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
    ext3: Add FITRIM handling
    ext3: Add batched discard support for ext3
    ext3: Add journal error check into ext3_rename()
    ext3: Use search_dirblock() in ext3_dx_find_entry()
    ext3: Avoid uninitialized memory references with a corrupted htree directory
    ext3: Return error code from generic_check_addressable
    ext3: Add journal error check into ext3_delete_entry()
    ext3: Add error check in ext3_mkdir()
    fs/ext3/super.c: Use printf extension %pV
    fs/ext2/super.c: Use printf extension %pV
    ext3: don't update sb journal_devnum when RO dev

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
    fs/9p: Don't set dentry->d_op in create routines
    fs/9p: fix spelling typo
    fs/9p: TREADLINK bugfix
    net/9p: Use proper data types
    fs/9p: Simplify the .L create operation
    fs/9p: Move dotl inode operations into a seperate file
    fs/9p: fix menu presentation
    fs/9p: Fix the return error on default acl removal
    fs/9p: Remove unnecessary semicolons

    Linus Torvalds
     
  • skb_cow_data() may allocate a new data buffer, so pointers on
    skb should be set after this function.

    Bug was introduced by commit dff3bb06 ("ah4: convert to ahash")
    and 8631e9bd ("ah6: convert to ahash").

    Signed-off-by: Wang Xuefu
    Acked-by: Krzysztof Witek
    Signed-off-by: Nicolas Dichtel
    Signed-off-by: David S. Miller

    Dang Hongwu
     
  • For SHA256, RFC4868 requires to truncate ICV length to 128 bits,
    hence MAX_AH_AUTH_LEN should be updated to 16.

    Signed-off-by: Nicolas Dichtel
    Signed-off-by: David S. Miller

    Nicolas Dichtel
     
  • Maximum trunc length is defined by MAX_AH_AUTH_LEN (in bytes)
    and need to be checked when this value is set (in bits) by
    the user. In ah4.c and ah6.c a BUG_ON() checks this condiftion.

    Signed-off-by: Nicolas Dichtel
    Signed-off-by: David S. Miller

    Nicolas Dichtel
     
  • Currently the skb array is not fully allocated, and the allocation
    is done as it's requested, which is not the expected way.

    This patch just allocate the full skb array at driver initialization.
    Also, this patch increases ehea version to 107.

    Signed-off-by: Breno Leitao
    Signed-off-by: David S. Miller

    Breno Leitao
     
  • Signed-off-by: Shawn Guo
    Signed-off-by: David S. Miller

    Shawn Guo
     
  • pcnet_cs:
    add another ID of "corega Ether CF-TD" 10Base-T PCMCIA card.

    Signed-off-by: Ken Kawasaki
    Signed-off-by: David S. Miller

    Ken Kawasaki
     
  • inet_csk_bind_conflict() logic currently disallows a bind() if
    it finds a friend socket (a socket bound on same address/port)
    satisfying a set of conditions :

    1) Current (to be bound) socket doesnt have sk_reuse set
    OR
    2) other socket doesnt have sk_reuse set
    OR
    3) other socket is in LISTEN state

    We should add the CLOSE state in the 3) condition, in order to avoid two
    REUSEADDR sockets in CLOSE state with same local address/port, since
    this can deny further operations.

    Note : a prior patch tried to address the problem in a different (and
    buggy) way. (commit fda48a0d7a8412ced tcp: bind() fix when many ports
    are bound).

    Reported-by: Gaspar Chilingarov
    Reported-by: Daniel Baluta
    Tested-by: Daniel Baluta
    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • When s_first_data_block is not zero (which happens e.g. when block size is 1KB)
    and trim ioctl is called to start trimming from block 0, the math in
    ext4_get_group_no_and_offset() overflows. The overall result is that ioctl
    returns EINVAL which is kind of unexpected and we probably don't want
    userspace tools to bother with internal details of filesystem structure.
    So just silently increase starting offset (and shorten length) when starting
    block is below s_first_data_block.

    CC: Lukas Czerner
    Signed-off-by: Jan Kara
    Signed-off-by: "Theodore Ts'o"

    Jan Kara
     
  • This reverts commit 4f531501e44: ext4: fix possible overflow in
    ext4_trim_fs()

    Signed-off-by: "Theodore Ts'o"

    Theodore Ts'o
     
  • * 'for-linus-merged' of git://oss.sgi.com/xfs/xfs: (47 commits)
    xfs: convert grant head manipulations to lockless algorithm
    xfs: introduce new locks for the log grant ticket wait queues
    xfs: convert log grant heads to atomic variables
    xfs: convert l_tail_lsn to an atomic variable.
    xfs: convert l_last_sync_lsn to an atomic variable
    xfs: make AIL tail pushing independent of the grant lock
    xfs: use wait queues directly for the log wait queues
    xfs: combine grant heads into a single 64 bit integer
    xfs: rework log grant space calculations
    xfs: fact out common grant head/log tail verification code
    xfs: convert log grant ticket queues to list heads
    xfs: use AIL bulk delete function to implement single delete
    xfs: use AIL bulk update function to implement single updates
    xfs: remove all the inodes on a buffer from the AIL in bulk
    xfs: consume iodone callback items on buffers as they are processed
    xfs: reduce the number of AIL push wakeups
    xfs: bulk AIL insertion during transaction commit
    xfs: clean up xfs_ail_delete()
    xfs: Pull EFI/EFD handling out from under the AIL lock
    xfs: fix EFI transaction cancellation.
    ...

    Linus Torvalds
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits)
    MAINTAINERS: Update Joel Becker's email address
    ocfs2: Remove unused truncate function from alloc.c
    ocfs2/cluster: dereferencing before checking in nst_seq_show()
    ocfs2: fix build for OCFS2_FS_STATS not enabled
    ocfs2/cluster: Show o2net timing statistics
    ocfs2/cluster: Track process message timing stats for each socket
    ocfs2/cluster: Track send message timing stats for each socket
    ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container
    ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking
    ocfs2: Add DEBUG_FS dependency
    ocfs2/dlm: Hard code the values for enums
    ocfs2/dlm: Minor cleanup
    ocfs2/dlm: Cleanup dlmdebug.c
    ocfs2: Release buffer_head in case of error in ocfs2_double_lock.
    ocfs2/cluster: Pin the local node when o2hb thread starts
    ocfs2/cluster: Show pin state for each o2hb region
    ocfs2/cluster: Pin/unpin o2hb regions
    ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap
    ocfs2/cluster: Pin the remote node item in configfs
    ocfs2/dlm: make existing convertion precedent over new lock
    ...

    Linus Torvalds
     
  • Indicate support for referrals. Do not set any PNFS roles. Check the flags
    returned by the server for validity. Do not use exchange flags from an old
    client ID instance when recovering a client ID.

    Update the EXCHID4_FLAG_XXX set to RFC 5661.

    Signed-off-by: Andy Adamson
    Signed-off-by: Trond Myklebust

    Andy Adamson
     
  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: remove obsolete DEBUG_BOOTMEM
    microblaze: trivial: Fix removed the part of line
    microblaze: Fix __muldi3 function for little-endian.
    microblaze: Clear i/dcache for sw breakpoints
    microblaze: Remove useless early_init_dt_check_for_initrd
    microblaze: Fix unaligned exception for little endian platform
    microblaze: Add PVR for Microblaze v8.00.b
    microblaze: Correct PVR access macros
    Revert "microblaze: Simplify syscall rutine"
    microblaze: Fix initramfs
    arch/microblaze: Remove unnecessary semicolons

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Fix Moorestown VRTC fixmap placement
    x86/gpio: Implement x86 gpio_to_irq convert function
    x86, UV: Fix APICID shift for Westmere processors
    x86: Use PCI method for enabling AMD extended config space before MSR method
    x86: tsc: Prevent delayed init if initial tsc calibration failed
    x86, lapic-timer: Increase the max_delta to 31 bits
    x86: Fix sparse non-ANSI function warnings in smpboot.c
    x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation
    x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h and 14h
    x86, numa: Fix cpu to node mapping for sparse node ids
    x86, numa: Fake node-to-cpumask for NUMA emulation
    x86, numa: Fake apicid and pxm mappings for NUMA emulation
    x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU
    x86, numa: Reduce minimum fake node size to 32M

    Fix up trivial conflict in arch/x86/kernel/apic/x2apic_uv_x.c

    Linus Torvalds
     
  • * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    rtc: Namespace fixup
    RTC: Remove UIE emulation
    RTC: Rework RTC code to use timerqueue for events

    Fix up trivial conflict in drivers/rtc/rtc-dev.c

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
    perf session: Fix infinite loop in __perf_session__process_events
    perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1)
    perf sched: Use PTHREAD_STACK_MIN to avoid pthread_attr_setstacksize() fail
    perf tools: Emit clearer message for sys_perf_event_open ENOENT return
    perf stat: better error message for unsupported events
    perf sched: Fix allocation result check
    perf, x86: P4 PMU - Fix unflagged overflows handling
    dynamic debug: Fix build issue with older gcc
    tracing: Fix TRACE_EVENT power tracepoint creation
    tracing: Fix preempt count leak
    tracepoint: Add __rcu annotation
    tracing: remove duplicate null-pointer check in skb tracepoint
    tracing/trivial: Add missing comma in TRACE_EVENT comment
    tracing: Include module.h in define_trace.h
    x86: Save rbp in pt_regs on irq entry
    x86, dumpstack: Fix unused variable warning
    x86, NMI: Clean-up default_do_nmi()
    x86, NMI: Allow NMI reason io port (0x61) to be processed on any CPU
    x86, NMI: Remove DIE_NMI_IPI
    x86, NMI: Add priorities to handlers
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (39 commits)
    mmc: davinci: add support for SDIO irq handling
    mmc: fix division by zero in MMC core
    mmc: tmio_mmc: fix CMD irq handling
    mmc: tmio_mmc: handle missing HW interrupts
    mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc
    mmc: tmio_mmc: implement SDIO IRQ support
    mfd: sdhi: require the tmio-mmc driver to bounce unaligned buffers
    mmc: tmio_mmc: silence compiler warnings
    mmc: tmio_mmc: implement a bounce buffer for unaligned DMA
    mmc: tmio_mmc: merge the private header into the driver
    mmc: tmio_mmc: fix PIO fallback on DMA descriptor allocation failure
    mmc: tmio_mmc: allow multi-element scatter-gather lists
    mmc: Register debugfs dir before calling card probe function.
    mmc: MMC_BLOCK_MINORS should depend on MMC_BLOCK.
    mmc: Explain why we make adjacent mmc_bus_{put,get} calls during rescan.
    mmc: Fix sd/sdio/mmc initialization frequency retries
    mmc: fix mmc_set_bus_width_ddr() call without bus-width-test cap
    mmc: dw_mmc: Add Synopsys DesignWare mmc host driver.
    mmc: add sdhci-tegra driver for Tegra SoCs
    mmc: sdhci: add quirk for max len ADMA descriptors
    ...

    Linus Torvalds