27 Apr, 2011

1 commit


21 Apr, 2011

2 commits


19 Apr, 2011

3 commits


14 Apr, 2011

3 commits


12 Apr, 2011

14 commits


11 Apr, 2011

9 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
    net: Add support for SMSC LAN9530, LAN9730 and LAN89530
    mlx4_en: Restoring RX buffer pointer in case of failure
    mlx4: Sensing link type at device initialization
    ipv4: Fix "Set rt->rt_iif more sanely on output routes."
    MAINTAINERS: add entry for Xen network backend
    be2net: Fix suspend/resume operation
    be2net: Rename some struct members for clarity
    pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
    dsa/mv88e6131: add support for mv88e6085 switch
    ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)
    be2net: Fix a potential crash during shutdown.
    bna: Fix for handling firmware heartbeat failure
    can: mcp251x: Allow pass IRQ flags through platform data.
    smsc911x: fix mac_lock acquision before calling smsc911x_mac_read
    iwlwifi: accept EEPROM version 0x423 for iwl6000
    rt2x00: fix cancelling uninitialized work
    rtlwifi: Fix some warnings/bugs
    p54usb: IDs for two new devices
    wl12xx: fix potential buffer overflow in testmode nvs push
    zd1211rw: reset rx idle timer from tasklet
    ...

    Linus Torvalds
     
  • Commit 000061245a6797d542854106463b6b20fbdcb12e, "dt/powerpc:
    Eliminate users of of_platform_{,un}register_driver" forgot to convert
    the type of structure passed into platform_device_register() when it
    was converted from of_platform_device_register. Fix it.

    Signed-off-by: Ira W. Snyder
    Signed-off-by: Grant Likely

    Ira W. Snyder
     
  • Revert commit 6de9843dab3f2a1d4d66d80aa9e5782f80977d20, since it
    caused a data corruption regression with BitTorrent downloads. Thanks
    to Damien for discovering and bisecting to find the problem commit.

    https://bugzilla.kernel.org/show_bug.cgi?id=32972

    Reported-by: Damien Grassart
    Signed-off-by: "Theodore Ts'o"

    Theodore Ts'o
     
  • We can create 4402345721856 byte file with indirect block mapping.
    However, if we grow an indirect-block file to the size with ftruncate(),
    we can see an ext4 warning. The following patch fixes this problem.

    How to reproduce:
    # dd if=/dev/zero of=/mnt/mp1/hoge bs=1 count=0 seek=4402345721856
    0+0 records in
    0+0 records out
    0 bytes (0 B) copied, 0.000221428 s, 0.0 kB/s
    # tail -n 1 /var/log/messages
    Nov 25 15:10:27 test kernel: EXT4-fs warning (device sda8): ext4_block_to_path:345: block 1074791436 > max in inode 12

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

    Kazuya Mio
     
  • ext4_journal_start_sb() should not prevent an active handle from being
    started due to s_frozen. Otherwise, deadlock is easy to happen, below
    is a situation.

    ================================================
    freeze | truncate
    ================================================
    | ext4_ext_truncate()
    freeze_super() | starts a handle
    sets s_frozen |
    | ext4_ext_truncate()
    | holds i_data_sem
    ext4_freeze() |
    waits for updates |
    | ext4_free_blocks()
    | calls dquot_free_block()
    |
    | dquot_free_blocks()
    | calls ext4_dirty_inode()
    |
    | ext4_dirty_inode()
    | trys to start an active
    | handle
    |
    | block due to s_frozen
    ================================================

    Signed-off-by: Yongqiang Yang
    Signed-off-by: "Theodore Ts'o"
    Reported-by: Amir Goldstein
    Reviewed-by: Jan Kara
    Reviewed-by: Andreas Dilger

    Yongqiang Yang
     
  • ext4 has taken the stance that, in the absence of a journal,
    when an fsync/fdatasync of an inode is done, the parent
    directory should be sync'ed if this inode entry is new.
    ext4_sync_parent(), which implements this, does indeed sync
    the dirent pages for parent directories, but it does not
    sync the directory *inode*. This patch fixes this.

    Also now return error status from ext4_sync_parent().

    I tested this using a power fail test, which panics a
    machine running a file server getting requests from a
    client. Without this patch, on about every other test run,
    the server is missing many, many files that had been synced.
    With this patch, on > 6 runs, I see zero files being lost.

    Google-Bug-Id: 4179519
    Signed-off-by: Curt Wohlgemuth
    Signed-off-by: "Theodore Ts'o"

    Curt Wohlgemuth
     
  • This patch adds support for SMSC's LAN9530, LAN9730 and LAN89530 USB
    ethernet controllers to the existing smsc95xx driver by adding
    their new USB VID/PID pairs.

    Signed-off-by: Steve Glendinning
    Signed-off-by: David S. Miller

    Steve Glendinning
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: hda - Don't query connections for widgets have no connections
    ALSA: HDA: Fix single internal mic on ALC275 (Sony Vaio VPCSB1C5E)
    ALSA: hda - HDMI: Fix MCP7x audio infoframe checksums
    ALSA: usb-audio: define another USB ID for a buggy USB MIDI cable
    ALSA: HDA: Fix dock mic for Lenovo X220-tablet
    ASoC: format_register_str: Don't clip register values
    ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare
    ASoC: zylonite: set .codec_dai_name in initializer

    Linus Torvalds
     
  • Lock stateid's can have access_bmap 0 if they were only partially
    initialized (due to a failed lock request); handle that case in
    free_generic_stateid.

    ------------[ cut here ]------------
    kernel BUG at fs/nfsd/nfs4state.c:380!
    invalid opcode: 0000 [#1] SMP
    last sysfs file: /sys/kernel/mm/ksm/run
    Modules linked in: nfs fscache md4 nls_utf8 cifs ip6table_filter ip6_tables ebtable_nat ebtables ipt_MASQUERADE iptable_nat nf_nat bridge stp llc nfsd lockd nfs_acl auth_rpcgss sunrpc ipv6 ppdev parport_pc parport pcnet32 mii pcspkr microcode i2c_piix4 BusLogic floppy [last unloaded: mperf]

    Pid: 1468, comm: nfsd Not tainted 2.6.38+ #120 VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform
    EIP: 0060:[] EFLAGS: 00010297 CPU: 0
    EIP is at nfs4_access_to_omode+0x1c/0x29 [nfsd]
    EAX: ffffffff EBX: dd758120 ECX: 00000000 EDX: 00000004
    ESI: dd758120 EDI: ddfe657c EBP: dd54dde0 ESP: dd54dde0
    DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
    Process nfsd (pid: 1468, ti=dd54c000 task=ddc92580 task.ti=dd54c000)
    Stack:
    dd54ddf0 e24f19ca 00000000 ddfe6560 dd54de08 e24f1a5d dd758130 deee3a20
    ddfe6560 31270000 dd54df1c e24f52fd 0000000f dd758090 e2505dd0 0be304cf
    dbb51d68 0000000e ddfe657c ddcd8020 dd758130 dd758128 dd7580d8 dd54de68
    Call Trace:
    [] free_generic_stateid+0x1c/0x3e [nfsd]
    [] release_lockowner+0x71/0x8a [nfsd]
    [] nfsd4_lock+0x617/0x66c [nfsd]
    [] ? nfsd_setuser+0x199/0x1bb [nfsd]
    [] ? nfsd_setuser_and_check_port+0x65/0x81 [nfsd]
    [] ? _cond_resched+0x8/0x1c
    [] ? slab_pre_alloc_hook.clone.33+0x23/0x27
    [] ? kmem_cache_alloc+0x1a/0xd2
    [] ? __call_rcu+0xd7/0xdd
    [] ? fh_verify+0x401/0x452 [nfsd]
    [] ? nfsd4_encode_operation+0x52/0x117 [nfsd]
    [] ? nfsd4_putfh+0x33/0x3b [nfsd]
    [] ? nfsd4_delegreturn+0xd4/0xd4 [nfsd]
    [] nfsd4_proc_compound+0x1ea/0x33e [nfsd]
    [] nfsd_dispatch+0xd1/0x1a5 [nfsd]
    [] svc_process_common+0x282/0x46f [sunrpc]
    [] svc_process+0xdc/0xfa [sunrpc]
    [] nfsd+0xd6/0x115 [nfsd]
    [] ? nfsd_shutdown+0x24/0x24 [nfsd]
    [] kthread+0x62/0x67
    [] ? kthread_worker_fn+0x114/0x114
    [] kernel_thread_helper+0x6/0x10
    Code: eb 05 b8 00 00 27 4f 8d 65 f4 5b 5e 5f 5d c3 83 e0 03 55 83 f8 02 89 e5 74 17 83 f8 03 74 05 48 75 09 eb 09 b8 02 00 00 00 eb 0b 0b 31 c0 eb 05 b8 01 00 00 00 5d c3 55 89 e5 57 56 89 d6 8d
    EIP: [] nfs4_access_to_omode+0x1c/0x29 [nfsd] SS:ESP 0068:dd54dde0
    ---[ end trace 2b0bf6c6557cb284 ]---

    The trace route is:

    -> nfsd4_lock()
    -> if (lock->lk_is_new) {
    -> alloc_init_lock_stateid()

    3739: stp->st_access_bmap = 0;

    ->if (status && lock->lk_is_new && lock_sop)
    -> release_lockowner()
    -> free_generic_stateid()
    -> nfs4_access_bmap_to_omode()
    -> nfs4_access_to_omode()

    380: BUG(); *****

    This problem was introduced by 0997b173609b9229ece28941c118a2a9b278796e.

    Reported-by: Mi Jinlong
    Tested-by: Mi Jinlong
    Signed-off-by: J. Bruce Fields

    J. Bruce Fields
     

10 Apr, 2011

1 commit

  • * git://git.infradead.org/mtd-2.6:
    mtd: atmel_nand: use CPU I/O when buffer is in vmalloc(ed) region
    mtd: atmel_nand: modify test case for using DMA operations
    mtd: atmel_nand: fix support for CPUs that do not support DMA access
    mtd: atmel_nand: trivial: change DMA usage information trace
    mtd: mtdswap: fix printk format warning

    Linus Torvalds
     

09 Apr, 2011

5 commits


08 Apr, 2011

2 commits