Skip to content
Commits on Dec 23, 2010
  1. Support dext3

    committed Dec 23, 2010
Commits on Dec 22, 2010
Commits on Dec 15, 2010
  1. @amir73il
  2. @amir73il
  3. @amir73il
  4. @amir73il
  5. @amir73il
  6. @amir73il

    change some debug prints

    amir73il committed Dec 15, 2010
Commits on Nov 29, 2010
  1. @amir73il

    commit left out snapshot files to tree

    I left those files out in the merge, I may need to redo the merge
    with v.2.6.35.9-next3.
    amir73il committed Nov 29, 2010
  2. @amir73il

    Fix following build error if CONFIG_QUOTA is not enabled.

    next3/super.c:2153: error: 'struct next3_sb_info' has no member 's_jquota_fmt'
    
    Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
    Signed-off-by: Amir Goldstein <amir73il@users.sf.net>
    amir73il committed Nov 29, 2010
Commits on Nov 26, 2010
  1. @amir73il
  2. @amir73il

    apply raw snapshot patch v1.0.13-rc5 over next3 clone

    the raw snapshot patch contains ifdef annotations which can be used to extract
    the snapshot patch series from any point in the branch.
    the extracted patch series can be applied on top of next3 clone
    (tag v2.6.35.9-next3 for example).
    amir73il committed Nov 26, 2010
  3. @amir73il

    clone next3 from ext3 of kernel 2.6.35.6

    snapshot pacthes apply on top of this code base
    and can be applied on top of ext3 clones from kernels 2.6.31-2.6.35
    amir73il committed Nov 26, 2010
Commits on Nov 25, 2010
  1. @amir73il

    simplify direct I/O move-on-write hook

    all the complexity in next3_get_block() just for direct I/O write.
    seperate it to a special function next3_get_block_dio().
    amir73il committed Nov 25, 2010
  2. @amir73il

    fix move-on-write path from direct_IO/mmap/quota_write

    The problems with the old data hooks are:
    1. second write to mmaped page did not call get_block() to trigger
       move-on-write.
    2. quota_write() called next3_bread(create=1) without notifying this
       is a partial write and move-on-write has corrupted it's data,
       resulting in broken quota file.
    3. direct I/O was not supported.
    
    The new design uses 3 buffer head flags to signal get_block() about
    move-on-write:
    1. buffer_move_data() is an explicit request to trigger move-on-write.
       users which do not declare move_data (like quota_write) will not
       trigger move-on-write. previous hooks would do move-on-write on
       all regular files data without an explicit request.
       new design suggests that we rather corrupt snapshot data
       (missed move-on-write) then corrupt the file system live data
       (false positive move-on-write).
    2. buffer_partial_write() signals that in case of move-on-write, the
       old block data
       needs to be read, before mapping the buffer to a new block.
    3. buffer_direct_io() signals that in case of move-on-write or hole filling,
       the buffer should not be mapped on return.
    
    There are 4 places I found that map data blocks and should trigger
    move-on-write:
    1. write_begin() sets move_data and optionally partial_write flags and unmaps
       buffers
    2. ordered_writepage() sets move_data flag and unmaps buffers
       (snapshots only work with data=ordered)
    3. truncate_page() sets move_data flag (and calls next3_get_block() itself)
    4. next3_get_block() sets direct_io and move_data flags when (create && !handle)
    
    Know issue:
    snapshot copy of quota files is not consistent with snapshot'ed
    file system (can be fixed, but is it relevant for read-only mount?)
    amir73il committed Nov 25, 2010
  3. @amir73il
Commits on Nov 22, 2010
  1. @gregkh

    Linux 2.6.35.9

    gregkh committed Nov 22, 2010
  2. @gregkh

    KVM: x86 emulator: fix regression with cmpxchg8b on i386 hosts

    commit 16518d5 upstream.
    
    operand::val and operand::orig_val are 32-bit on i386, whereas cmpxchg8b
    operands are 64-bit.
    
    Fix by adding val64 and orig_val64 union members to struct operand, and
    using them where needed.
    
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Avi Kivity committed with gregkh Aug 26, 2010
  3. @tilmanschmidt @gregkh

    isdn: avoid calling tty_ldisc_flush() in atomic context

    commit bc10f96 upstream.
    
    Remove the call to tty_ldisc_flush() from the RESULT_NO_CARRIER
    branch of isdn_tty_modem_result(), as already proposed in commit
    00409bb.
    This avoids a "sleeping function called from invalid context" BUG
    when the hardware driver calls the statcallb() callback with
    command==ISDN_STAT_DHUP in atomic context, which in turn calls
    isdn_tty_modem_result(RESULT_NO_CARRIER, ~), and from there,
    tty_ldisc_flush() which may sleep.
    
    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    tilmanschmidt committed with gregkh Jul 5, 2010
  4. @gregkh

    sgi-xp: incoming XPC channel messages can come in after the channel's…

    … partition structures have been torn down
    
    commit 0935897 upstream.
    
    Under some workloads, some channel messages have been observed being
    delayed on the sending side past the point where the receiving side has
    been able to tear down its partition structures.
    
    This condition is already detected in xpc_handle_activate_IRQ_uv(), but
    that information is not given to xpc_handle_activate_mq_msg_uv().  As a
    result, xpc_handle_activate_mq_msg_uv() assumes the structures still exist
    and references them, causing a NULL-pointer deref.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Robin Holt committed with gregkh Oct 26, 2010
  5. @mkl0301 @gregkh

    ARM: cns3xxx: Fixup the missing second parameter to addruart macro to…

    … allow them to build.
    
    It can't be merged into Linus' tree because this file has already been
    changed in incompatible ways.
    
    Fixup the missing second parameter to addruart macro to allow them to build,
    according to to commit 0e17226.
    
    Enabling DEBUG in head.S would cause:
    rch/arm/boot/compressed/head.S: Assembler messages:
    arch/arm/boot/compressed/head.S:1037: Error: too many positional arguments
    arch/arm/boot/compressed/head.S:1055: Error: too many positional arguments
    
    Signed-off-by: Mac Lin <mkl0301@gmail.com>
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    mkl0301 committed with gregkh Nov 14, 2010
  6. @eparis @gregkh

    secmark: do not return early if there was no error

    commit 15714f7 upstream.
    
    Commit 4a5a5c7 attempted to pass decent error messages back to userspace for
    netfilter errors.  In xt_SECMARK.c however the patch screwed up and returned
    on 0 (aka no error) early and didn't finish setting up secmark.  This results
    in a kernel BUG if you use SECMARK.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Acked-by: Paul Moore <paul.moore@hp.com>
    Signed-off-by: James Morris <jmorris@namei.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    eparis committed with gregkh Oct 12, 2010
  7. @gregkh

    xfrm4: strip ECN bits from tos field

    [ Upstream commit 94e2238 ]
    
    otherwise ECT(1) bit will get interpreted as RTO_ONLINK
    and routing will fail with XfrmOutBundleGenError.
    
    Signed-off-by: Ulrich Weber <uweber@astaro.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Ulrich Weber committed with gregkh Sep 22, 2010
  8. @greearb @gregkh

    net/core: Allow tagged VLAN packets to flow through VETH devices.

    [ Upstream commit d2ed817 ]
    
    When there are VLANs on a VETH device, the packets being transmitted
    through the VETH device may be 4 bytes bigger than MTU.  A check
    in dev_forward_skb did not take this into account and so dropped
    these packets.
    
    This patch is needed at least as far back as 2.6.34.7 and should
    be considered for -stable.
    
    Signed-off-by: Ben Greear <greearb@candelatech.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    greearb committed with gregkh Oct 21, 2010
  9. @gregkh

    net: add a recursion limit in xmit path

    [ Upstream commits 745e20f and
      11a766c ]
    
    As tunnel devices are going to be lockless, we need to make sure a
    misconfigured machine wont enter an infinite loop.
    
    Add a percpu variable, and limit to three the number of stacked xmits.
    
    Reported-by: Jesse Gross <jesse@nicira.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Eric Dumazet committed with gregkh Sep 29, 2010
  10. @gregkh

    Revert d88dca7

    [ Upstream commit db5a753 ]
    
    TIPC needs to have its endianess issues fixed.  Unfortunately, the format of a
    subscriber message is passed in directly from user space, so requiring this
    message to be in network byte order breaks user space ABI.  Revert this change
    until such time as we can determine how to do this in a backwards compatible
    manner.
    
    Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Neil Horman committed with gregkh Oct 21, 2010
  11. @gregkh

    Revert c6537d6

    [ Upstream commit 8c97443 ]
    
    Backout the tipc changes to the flags int he subscription message.  These
    changees, while reasonable on the surface, interefere with user space ABI
    compatibility which is a no-no.  This was part of the changes to fix the
    endianess issues in the TIPC protocol, which would be really nice to do but we
    need to do so in a way that is backwards compatible with user space.
    
    Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Neil Horman committed with gregkh Oct 21, 2010
  12. @gregkh

    net-2.6: SYN retransmits: Add new parameter to retransmits_timed_out()

    [ Upstream commit 4d22f7d ]
    
    Fixes kernel Bugzilla Bug 18952
    
    This patch adds a syn_set parameter to the retransmits_timed_out()
    routine and updates its callers. If not set, TCP_RTO_MIN is taken
    as the calculation basis as before. If set, TCP_TIMEOUT_INIT is
    used instead, so that sysctl_syn_retries represents the actual
    amount of SYN retransmissions in case no SYNACKs are received when
    establishing a new connection.
    
    Signed-off-by: Damian Lukowski <damian@tvk.rwth-aachen.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Damian Lukowski committed with gregkh Sep 28, 2010
  13. @tdm @gregkh

    tcp: Fix race in tcp_poll

    [ Upstream commit a4d2580 ]
    
    If a RST comes in immediately after checking sk->sk_err, tcp_poll will
    return POLLIN but not POLLOUT.  Fix this by checking sk->sk_err at the end
    of tcp_poll.  Additionally, ensure the correct order of operations on SMP
    machines with memory barriers.
    
    Signed-off-by: Tom Marshall <tdm.code@gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    tdm committed with gregkh Sep 20, 2010
  14. @gregkh

    Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integ…

    …er overflows.
    
    On a 16TB x86_64 machine, sysctl_tcp_mem[2], sysctl_udp_mem[2], and
    sysctl_sctp_mem[2] can integer overflow.  Set limit such that they are
    maximized without overflowing.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    To: "David S. Miller" <davem@davemloft.net>
    Cc: Willy Tarreau <w@1wt.eu>
    Cc: linux-kernel@vger.kernel.org
    Cc: netdev@vger.kernel.org
    Cc: linux-sctp@vger.kernel.org
    Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
    Cc: "Pekka Savola (ipv6)" <pekkas@netcore.fi>
    Cc: James Morris <jmorris@namei.org>
    Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
    Cc: Patrick McHardy <kaber@trash.net>
    Cc: Vlad Yasevich <vladislav.yasevich@hp.com>
    Cc: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    holt@sgi.com committed with gregkh Oct 20, 2010
  15. @gregkh

    net: Fix the condition passed to sk_wait_event()

    [ Upstream commit 482964e ]
    
    This patch fixes the condition (3rd arg) passed to sk_wait_event() in
    sk_stream_wait_memory(). The incorrect check in sk_stream_wait_memory()
    causes the following soft lockup in tcp_sendmsg() when the global tcp
    memory pool has exhausted.
    
    >>> snip <<<
    
    localhost kernel: BUG: soft lockup - CPU#3 stuck for 11s! [sshd:6429]
    localhost kernel: CPU 3:
    localhost kernel: RIP: 0010:[sk_stream_wait_memory+0xcd/0x200]  [sk_stream_wait_memory+0xcd/0x200] sk_stream_wait_memory+0xcd/0x200
    localhost kernel:
    localhost kernel: Call Trace:
    localhost kernel:  [sk_stream_wait_memory+0x1b1/0x200] sk_stream_wait_memory+0x1b1/0x200
    localhost kernel:  [<ffffffff802557c0>] autoremove_wake_function+0x0/0x40
    localhost kernel:  [ipv6:tcp_sendmsg+0x6e6/0xe90] tcp_sendmsg+0x6e6/0xce0
    localhost kernel:  [sock_aio_write+0x126/0x140] sock_aio_write+0x126/0x140
    localhost kernel:  [xfs:do_sync_write+0xf1/0x130] do_sync_write+0xf1/0x130
    localhost kernel:  [<ffffffff802557c0>] autoremove_wake_function+0x0/0x40
    localhost kernel:  [hrtimer_start+0xe3/0x170] hrtimer_start+0xe3/0x170
    localhost kernel:  [vfs_write+0x185/0x190] vfs_write+0x185/0x190
    localhost kernel:  [sys_write+0x50/0x90] sys_write+0x50/0x90
    localhost kernel:  [system_call+0x7e/0x83] system_call+0x7e/0x83
    
    >>> snip <<<
    
    What is happening is, that the sk_wait_event() condition passed from
    sk_stream_wait_memory() evaluates to true for the case of tcp global memory
    exhaustion. This is because both sk_stream_memory_free() and vm_wait are true
    which causes sk_wait_event() to *not* call schedule_timeout().
    Hence sk_stream_wait_memory() returns immediately to the caller w/o sleeping.
    This causes the caller to again try allocation, which again fails and again
    calls sk_stream_wait_memory(), and so on.
    
    [ Bug introduced by commit c1cbe4b
      ("[NET]: Avoid atomic xchg() for non-error case") -DaveM ]
    
    Signed-off-by: Nagendra Singh Tomar <tomer_iisc@yahoo.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Nagendra Tomar committed with gregkh Oct 2, 2010
  16. @davem330 @gregkh

    rose: Fix signedness issues wrt. digi count.

    [ Upstream commit 9828e6e ]
    
    Just use explicit casts, since we really can't change the
    types of structures exported to userspace which have been
    around for 15 years or so.
    
    Reported-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    davem330 committed with gregkh Sep 20, 2010
  17. @bwhacks @gregkh

    r6040: Fix multicast filter some more

    [ Upstream commit e226930 ]
    
    This code has been broken forever, but in several different and
    creative ways.
    
    So far as I can work out, the R6040 MAC filter has 4 exact-match
    entries, the first of which the driver uses for its assigned unicast
    address, plus a 64-entry hash-based filter for multicast addresses
    (maybe unicast as well?).
    
    The original version of this code would write the first 4 multicast
    addresses as exact-match entries from offset 1 (bug #1: there is no
    entry 4 so this could write to some PHY registers).  It would fill the
    remainder of the exact-match entries with the broadcast address (bug #2:
    this would overwrite the last used entry).  If more than 4 multicast
    addresses were configured, it would set up the hash table, write some
    random crap to the MAC control register (bug #3) and finally walk off
    the end of the list when filling the exact-match entries (bug #4).
    
    All of this seems to be pointless, since it sets the promiscuous bit
    when the interface is made promiscuous or if >4 multicast addresses
    are enabled, and never clears it (bug #5, masking bug #2).
    
    The recent(ish) changes to the multicast list fixed bug #4, but
    completely removed the limit on iteration over the exact-match entries
    (bug #6).
    
    Bug #4 was reported as
    <https://bugzilla.kernel.org/show_bug.cgi?id=15355> and more recently
    as <http://bugs.debian.org/600155>.  Florian Fainelli attempted to fix
    these in commit 3bcf822, but that
    actually dealt with bugs #1-3, bug #4 having been fixed in mainline at
    that point.
    
    That commit fixes the most important current bug #6.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    bwhacks committed with gregkh Oct 14, 2010
  18. @gregkh

    Phonet: Correct header retrieval after pskb_may_pull

    [ Upstream commit a91e7d4 ]
    
    Retrieve the header after doing pskb_may_pull since, pskb_may_pull
    could change the buffer structure.
    
    This is based on the comment given by Eric Dumazet on Phonet
    Pipe controller patch for a similar problem.
    
    Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
    Acked-by: Linus Walleij <linus.walleij@stericsson.com>
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Acked-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Kumar Sanghvi committed with gregkh Sep 27, 2010
  19. @gregkh

    qlcnic: dont set skb->truesize

    [ Upstream commit 8df8fd2 ]
    
    skb->truesize is set in core network.
    
    Dont change it unless dealing with fragments.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Eric Dumazet committed with gregkh Sep 20, 2010
Something went wrong with that request. Please try again.