12 Jul, 2010

4 commits


30 Jun, 2010

1 commit


28 Jun, 2010

2 commits


17 Jun, 2010

11 commits


16 Jun, 2010

1 commit


12 Jun, 2010

21 commits

  • Linus Torvalds
     
  • * 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

    Linus Torvalds
     
  • * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    PM / x86: Save/restore MISC_ENABLE register

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • 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
    Acked-by: Bjorn Helgaas
    Signed-off-by: Yinghai Lu
    Signed-off-by: Jesse Barnes

    Yinghai Lu
     
  • 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: [] 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
    Cc: Greg KH
    Signed-off-by: Jesse Barnes

    Jiri Slaby
     
  • This reverts commit 75568f8094eb0333e9c2109b23cbc8b82d318a3c.

    Since they're just a convenience anyway, remove these symlinks since
    they're causing duplicate filename errors in the wild.

    Acked-by: Alex Chiang
    Signed-off-by: Jesse Barnes

    Jesse Barnes
     
  • 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
    Signed-off-by: Jesse Barnes

    Bjorn Helgaas
     
  • The "file" argument for fsync is never null so we can remove this check.

    What drew my attention here is that 7ea8085910e: "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
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • 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
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • 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
    Signed-off-by: Chris Mason

    Sage Weil
     
  • 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
    Signed-off-by: Chris Mason

    Shi Weihua
     
  • 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
    Signed-off-by: Chris Mason

    Shi Weihua
     
  • btrfs_lookup_dir_item() can return either ERR_PTRs or null.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • 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
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • This was added by a22285a6a3: "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
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • btrfs_iget() returns an ERR_PTR() on failure and not null.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • Unwind and return -ENOMEM if the allocation fails here.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • If btrfs_lookup_dir_item() fails, we should can just let the mount fail
    with an error.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Chris Mason

    Dan Carpenter
     
  • 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
    Signed-off-by: Chris Mason

    Yan, Zheng