Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 12, 2010
  1. Linux 2.6.35-rc3

    authored
Commits on Jun 11, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      wimax/i2400m: fix missing endian correction read in fw loader
      net8139: fix a race at the end of NAPI
      pktgen: Fix accuracy of inter-packet delay.
      pkt_sched: gen_estimator: add a new lock
      net: deliver skbs on inactive slaves to exact matches
      ipv6: fix ICMP6_MIB_OUTERRORS
      r8169: fix mdio_read and update mdio_write according to hw specs
      gianfar: Revive the driver for eTSEC devices (disable timestamping)
      caif: fix a couple range checks
      phylib: Add support for the LXT973 phy.
      net: Print num_rx_queues imbalance warning only when there are allocated queues
  2. Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / x86: Save/restore MISC_ENABLE register
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: The file argument for fsync() is never null
      Btrfs: handle ERR_PTR from posix_acl_from_xattr()
      Btrfs: avoid BUG when dropping root and reference in same transaction
      Btrfs: prohibit a operation of changing acl's mask when noacl mount option used
      Btrfs: should add a permission check for setfacl
      Btrfs: btrfs_lookup_dir_item() can return ERR_PTR
      Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRs
      Btrfs: unwind after btrfs_start_transaction() errors
      Btrfs: btrfs_iget() returns ERR_PTR
      Btrfs: handle kzalloc() failure in open_ctree()
      Btrfs: handle error returns from btrfs_lookup_dir_item()
      Btrfs: Fix BUG_ON for fs converted from extN
      Btrfs: Fix null dereference in relocation.c
      Btrfs: fix remap_file_pages error
      Btrfs: uninitialized data is check_path_shared()
      Btrfs: fix fallocate regression
      Btrfs: fix loop device on top of btrfs
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: clear bridge resource range if BIOS assigned bad one
      PCI: hotplug/cpqphp, fix NULL dereference
      Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"
      PCI: change resource collision messages from KERN_ERR to KERN_INFO
  5. PCI: clear bridge resource range if BIOS assigned bad one

    Yinghai Lu authored Jesse Barnes committed
    Yannick found that video does not work with 2.6.34.  The cause of this
    bug was that the BIOS had assigned the wrong range to the PCI bridge
    above the video device.  Before 2.6.34 the kernel would have shrunk
    the size of the bridge window, but since
      d65245c PCI: don't shrink bridge resources
    the kernel will avoid shrinking BIOS ranges.
    
    So zero out the old range if we fail to claim it at boot time; this will
    cause us to allocate a new range at startup, restoring the 2.6.34
    behavior.
    
    Fixes regression https://bugzilla.kernel.org/show_bug.cgi?id=16009.
    
    Reported-by: Yannick <yannick.roehlly@free.fr>
    Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  6. PCI: hotplug/cpqphp, fix NULL dereference

    Jiri Slaby authored Jesse Barnes committed
    There are devices out there which are PCI Hot-plug controllers with
    compaq PCI IDs, but are not bridges, hence have pdev->subordinate
    NULL. But cpqphp expects the pointer to be non-NULL.
    
    Add a check to the probe function to avoid oopses like:
    BUG: unable to handle kernel NULL pointer dereference at 00000050
    IP: [<f82e3c41>] cpqhpc_probe+0x951/0x1120 [cpqphp]
    *pdpt = 0000000033779001 *pde = 0000000000000000
    ...
    
    The device here was:
    00:0b.0 PCI Hot-plug controller [0804]: Compaq Computer Corporation PCI Hotplug Controller [0e11:a0f7] (rev 11)
    	Subsystem: Compaq Computer Corporation Device [0e11:a2f8]
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  7. Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"

    Jesse Barnes authored
    This reverts commit 75568f8.
    
    Since they're just a convenience anyway, remove these symlinks since
    they're causing duplicate filename errors in the wild.
    
    Acked-by: Alex Chiang <achiang@canonical.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  8. PCI: change resource collision messages from KERN_ERR to KERN_INFO

    Bjorn Helgaas authored Jesse Barnes committed
    We can often deal with PCI resource issues by moving devices around.  In
    that case, there's no point in alarming the user with messages like these.
    There are many bug reports where the message itself is the only problem,
    e.g., https://bugs.launchpad.net/ubuntu/+source/linux/+bug/413419 .
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  9. @error27 @chrismason-xx

    Btrfs: The file argument for fsync() is never null

    error27 authored chrismason-xx committed
    The "file" argument for fsync is never null so we can remove this check.
    
    What drew my attention here is that 7ea8085: "drop unused dentry
    argument to ->fsync" introduced an unconditional dereference at the
    start of the function and that generated a smatch warning.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  10. @error27 @chrismason-xx

    Btrfs: handle ERR_PTR from posix_acl_from_xattr()

    error27 authored chrismason-xx committed
    posix_acl_from_xattr() returns both ERR_PTRs and null, but it's OK to
    pass null values to set_cached_acl()
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  11. @liewegas @chrismason-xx

    Btrfs: avoid BUG when dropping root and reference in same transaction

    liewegas authored chrismason-xx committed
    If btrfs_ioctl_snap_destroy() deletes a snapshot but finishes
    with end_transaction(), the cleaner kthread may come in and
    drop the root in the same transaction.  If that's the case, the
    root's refs still == 1 in the tree when btrfs_del_root() deletes
    the item, because commit_fs_roots() hasn't updated it yet (that
    happens during the commit).
    
    This wasn't a problem before only because
    btrfs_ioctl_snap_destroy() would commit the transaction before dropping
    the dentry reference, so the dead root wouldn't get queued up until
    after the fs root item was updated in the btree.
    
    Since it is not an error to drop the root reference and the root in the
    same transaction, just drop the BUG_ON() in btrfs_del_root().
    
    Signed-off-by: Sage Weil <sage@newdream.net>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  12. @shiwh @chrismason-xx

    Btrfs: prohibit a operation of changing acl's mask when noacl mount o…

    shiwh authored chrismason-xx committed
    …ption used
    
    when used Posix File System Test Suite(pjd-fstest) to test btrfs,
    some cases about setfacl failed when noacl mount option used.
    I simplified used commands in pjd-fstest, and the following steps
    can reproduce it.
    ------------------------
    # cd btrfs-part/
    # mkdir aaa
    # setfacl -m m::rw aaa    <- successed, but not expected by pjd-fstest.
    ------------------------
    I checked ext3, a warning message occured, like as:
      setfacl: aaa/: Operation not supported
    Certainly, it's expected by pjd-fstest.
    
    So, i compared acl.c of btrfs and ext3. Based on that, a patch created.
    Fortunately, it works.
    
    Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  13. @shiwh @chrismason-xx

    Btrfs: should add a permission check for setfacl

    shiwh authored chrismason-xx committed
    On btrfs, do the following
    ------------------
    # su user1
    # cd btrfs-part/
    # touch aaa
    # getfacl aaa
      # file: aaa
      # owner: user1
      # group: user1
      user::rw-
      group::rw-
      other::r--
    # su user2
    # cd btrfs-part/
    # setfacl -m u::rwx aaa
    # getfacl aaa
      # file: aaa
      # owner: user1
      # group: user1
      user::rwx           <- successed to setfacl
      group::rw-
      other::r--
    ------------------
    but we should prohibit it that user2 changing user1's acl.
    In fact, on ext3 and other fs, a message occurs:
      setfacl: aaa: Operation not permitted
    
    This patch fixed it.
    Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  14. @error27 @chrismason-xx

    Btrfs: btrfs_lookup_dir_item() can return ERR_PTR

    error27 authored chrismason-xx committed
    btrfs_lookup_dir_item() can return either ERR_PTRs or null.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  15. @error27 @chrismason-xx

    Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRs

    error27 authored chrismason-xx committed
    btrfs_read_fs_root_no_name() returns ERR_PTRs on error so I added a
    check for that.  It's not clear to me if it can also return NULL
    pointers or not so I left the original NULL pointer check as is.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  16. @error27 @chrismason-xx

    Btrfs: unwind after btrfs_start_transaction() errors

    error27 authored chrismason-xx committed
    This was added by a22285a: "Btrfs: Integrate metadata reservation
    with start_transaction".  If we goto out here then we skip all the
    unwinding and there are locks still held etc.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  17. @error27 @chrismason-xx

    Btrfs: btrfs_iget() returns ERR_PTR

    error27 authored chrismason-xx committed
    btrfs_iget() returns an ERR_PTR() on failure and not null.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  18. @error27 @chrismason-xx

    Btrfs: handle kzalloc() failure in open_ctree()

    error27 authored chrismason-xx committed
    Unwind and return -ENOMEM if the allocation fails here.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  19. @error27 @chrismason-xx

    Btrfs: handle error returns from btrfs_lookup_dir_item()

    error27 authored chrismason-xx committed
    If btrfs_lookup_dir_item() fails, we should can just let the mount fail
    with an error.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  20. @chrismason-xx

    Btrfs: Fix BUG_ON for fs converted from extN

    Yan, Zheng authored chrismason-xx committed
    Tree blocks can live in data block groups in FS converted from extN.
    So it's easy to trigger the BUG_ON.
    
    Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  21. @chrismason-xx

    Btrfs: Fix null dereference in relocation.c

    Yan, Zheng authored chrismason-xx committed
    Fix a potential null dereference in relocation.c
    
    Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
    Acked-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  22. @davem330
  23. @inakypg

    wimax/i2400m: fix missing endian correction read in fw loader

    inakypg authored
    i2400m_fw_hdr_check() was accessing hardware field
    bcf_hdr->module_type (little endian 32) without converting to host
    byte sex.
    
    Reported-by: Данилин Михаил <mdanilin@nsg.net.ru>
    
    Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
  24. Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/mmarek/kbuild-2.6
    
    * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      kbuild: Create output directory in Makefile.modbuiltin
      kbuild: Generate modules.builtin in make modules
  25. Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    authored
    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: avoid validate_cis failure on CIS override
      pcmcia: dev_node removal bugfix
      pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI
      pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq
  26. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: try to send partial cap release on cap message on missing inode
      ceph: release cap on import if we don't have the inode
      ceph: fix misleading/incorrect debug message
      ceph: fix atomic64_t initialization on ia64
      ceph: fix lease revocation when seq doesn't match
      ceph: fix f_namelen reported by statfs
      ceph: fix memory leak in statfs
      ceph: fix d_subdirs ordering problem
  27. @miaoxie @chrismason-xx

    Btrfs: fix remap_file_pages error

    miaoxie authored chrismason-xx committed
    when we use remap_file_pages() to remap a file, remap_file_pages always return
    error. It is because btrfs didn't set VM_CAN_NONLINEAR for vma.
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  28. @error27 @chrismason-xx

    Btrfs: uninitialized data is check_path_shared()

    error27 authored chrismason-xx committed
    refs can be used with uninitialized data if btrfs_lookup_extent_info()
    fails on the first pass through the loop.  In the original code if that
    happens then check_path_shared() probably returns 1, this patch
    changes it to return 1 for safety.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  29. @chrismason-xx

    Btrfs: fix fallocate regression

    Josef Bacik authored chrismason-xx committed
    Seems that when btrfs_fallocate was converted to use the new ENOSPC stuff we
    dropped passing the mode to the function that actually does the preallocation.
    This breaks anybody who wants to use FALLOC_FL_KEEP_SIZE.  Thanks,
    
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  30. @miaoxie @chrismason-xx

    Btrfs: fix loop device on top of btrfs

    miaoxie authored chrismason-xx committed
    We cannot use the loop device which has been connected to a file in the btrf
    
    The reproduce steps is following:
     # dd if=/dev/zero of=vdev0 bs=1M count=1024
     # losetup /dev/loop0 vdev0
     # mkfs.btrfs /dev/loop0
     ...
     failed to zero device start -5
    
    The reason is that the btrfs don't implement either ->write_begin or ->write
    the VFS API, so we fix it by setting ->write to do_sync_write().
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  31. @davem330

    net8139: fix a race at the end of NAPI

    Figo.zhang authored davem330 committed
    fix a race at the end of NAPI complete processing, it had
    better do __napi_complete() first before re-enable interrupt.
    
    Signed-off-by:Figo.zhang <figo1802@gmail.com>
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  32. @danieltt @davem330

    pktgen: Fix accuracy of inter-packet delay.

    danieltt authored davem330 committed
    This patch correct a bug in the delay of pktgen. 
    It makes sure the inter-packet interval is accurate.
    
    Signed-off-by: Daniel Turull <daniel.turull@gmail.com>
    Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  33. @davem330

    pkt_sched: gen_estimator: add a new lock

    Eric Dumazet authored davem330 committed
    gen_kill_estimator() / gen_new_estimator() is not always called with
    RTNL held.
    
    net/netfilter/xt_RATEEST.c is one user of these API that do not hold
    RTNL, so random corruptions can occur between "tc" and "iptables".
    
    Add a new fine grained lock instead of trying to use RTNL in netfilter.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  34. @jrfastab @davem330

    net: deliver skbs on inactive slaves to exact matches

    jrfastab authored davem330 committed
    Currently, the accelerated receive path for VLAN's will
    drop packets if the real device is an inactive slave and
    is not one of the special pkts tested for in
    skb_bond_should_drop().  This behavior is different then
    the non-accelerated path and for pkts over a bonded vlan.
    
    For example,
    
    vlanx -> bond0 -> ethx
    
    will be dropped in the vlan path and not delivered to any
    packet handlers at all.  However,
    
    bond0 -> vlanx -> ethx
    
    and
    
    bond0 -> ethx
    
    will be delivered to handlers that match the exact dev,
    because the VLAN path checks the real_dev which is not a
    slave and netif_recv_skb() doesn't drop frames but only
    delivers them to exact matches.
    
    This patch adds a sk_buff flag which is used for tagging
    skbs that would previously been dropped and allows the
    skb to continue to skb_netif_recv().  Here we add
    logic to check for the deliver_no_wcard flag and if it
    is set only deliver to handlers that match exactly.  This
    makes both paths above consistent and gives pkt handlers
    a way to identify skbs that come from inactive slaves.
    Without this patch in some configurations skbs will be
    delivered to handlers with exact matches and in others
    be dropped out right in the vlan path.
    
    I have tested the following 4 configurations in failover modes
    and load balancing modes.
    
    # bond0 -> ethx
    
    # vlanx -> bond0 -> ethx
    
    # bond0 -> vlanx -> ethx
    
    # bond0 -> ethx
                |
      vlanx -> --
    
    Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.