1. 26 10月, 2010 30 次提交
  2. 25 10月, 2010 10 次提交
    • M
      [SCSI] Fix regressions in scsi_internal_device_block · 986fe6c7
      Mike Christie 提交于
      Deleting a SCSI device on a blocked fc_remote_port (before
      fast_io_fail_tmo fires) results in a hanging thread:
      
        STACK:
        0 schedule+1108 [0x5cac48]
        1 schedule_timeout+528 [0x5cb7fc]
        2 wait_for_common+266 [0x5ca6be]
        3 blk_execute_rq+160 [0x354054]
        4 scsi_execute+324 [0x3b7ef4]
        5 scsi_execute_req+162 [0x3b80ca]
        6 sd_sync_cache+138 [0x3cf662]
        7 sd_shutdown+138 [0x3cf91a]
        8 sd_remove+112 [0x3cfe4c]
        9 __device_release_driver+124 [0x3a08b8]
      10 device_release_driver+60 [0x3a0a5c]
      11 bus_remove_device+266 [0x39fa76]
      12 device_del+340 [0x39d818]
      13 __scsi_remove_device+204 [0x3bcc48]
      14 scsi_remove_device+66 [0x3bcc8e]
      15 sysfs_schedule_callback_work+50 [0x260d66]
      16 worker_thread+622 [0x162326]
      17 kthread+160 [0x1680b0]
      18 kernel_thread_starter+6 [0x10aaea]
      
      During the delete, the SCSI device is in moved to SDEV_CANCEL.  When
      the FC transport class later calls scsi_target_unblock, this has no
      effect, since scsi_internal_device_unblock ignores SCSI devics in this
      state.
      
      It looks like all these are regressions caused by:
      5c10e63c
      [SCSI] limit state transitions in scsi_internal_device_unblock
      
      Fix by rejecting offline and cancel in the state transition.
      Signed-off-by: NChristof Schmitt <christof.schmitt@de.ibm.com>
      [jejb: Original patch by Christof Schmitt, modified by Mike Christie]
      Cc: Stable Tree <stable@kernel.org>
      Signed-off-by: NJames Bottomley <James.Bottomley@suse.de>
      986fe6c7
    • C
      [SCSI] zfcp: Use correct length for FCP_RSP_INFO · fb5a6389
      Christof Schmitt 提交于
      Use the FCP_RSP_INFO length to correctly skip the FCP_RSP_INFO field.
      Reviewed-by: NSwen Schillig <swen@vnet.ibm.com>
      Signed-off-by: NChristof Schmitt <christof.schmitt@de.ibm.com>
      Signed-off-by: NJames Bottomley <James.Bottomley@suse.de>
      fb5a6389
    • C
      [SCSI] zfcp: Call get_device on port before calling put_device · 1a9708cd
      Christof Schmitt 提交于
      zfcp_unit_release calls put_device on the port. Ensure that get_device
      has been called before possibly triggering the release function
      through put_device or device_unregister.
      Reviewed-by: NSwen Schillig <swen@vnet.ibm.com>
      Signed-off-by: NChristof Schmitt <christof.schmitt@de.ibm.com>
      Signed-off-by: NJames Bottomley <James.Bottomley@suse.de>
      1a9708cd
    • S
      [SCSI] zfcp: Fix adapter activation on link down · 0df13847
      Swen Schillig 提交于
      If an exchange config is executed while the local link is down, the
      request succeeds but the returned data is incomplete.  Proceeding with
      the adapter activation is leading to an unpredictable behaviour (e.g.
      kernel panic) caused by invalid values.  In such a scenario the
      recommended ERP is to retry the action and wait for a link up event.
      If the issue persists the activation has to fail.
      Signed-off-by: NSwen Schillig <swen@vnet.ibm.com>
      Sigend-off-by: NChristof Schmitt <christof.schmitt@de.ibm.com>
      Signed-off-by: NJames Bottomley <James.Bottomley@suse.de>
      0df13847
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 229aebb8
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        Update broken web addresses in arch directory.
        Update broken web addresses in the kernel.
        Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
        Revert "Fix typo: configuation => configuration" partially
        ida: document IDA_BITMAP_LONGS calculation
        ext2: fix a typo on comment in ext2/inode.c
        drivers/scsi: Remove unnecessary casts of private_data
        drivers/s390: Remove unnecessary casts of private_data
        net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
        drivers/infiniband: Remove unnecessary casts of private_data
        drivers/gpu/drm: Remove unnecessary casts of private_data
        kernel/pm_qos_params.c: Remove unnecessary casts of private_data
        fs/ecryptfs: Remove unnecessary casts of private_data
        fs/seq_file.c: Remove unnecessary casts of private_data
        arm: uengine.c: remove C99 comments
        arm: scoop.c: remove C99 comments
        Fix typo configue => configure in comments
        Fix typo: configuation => configuration
        Fix typo interrest[ing|ed] => interest[ing|ed]
        Fix various typos of valid in comments
        ...
      
      Fix up trivial conflicts in:
      	drivers/char/ipmi/ipmi_si_intf.c
      	drivers/usb/gadget/rndis.c
      	net/irda/irnet/irnet_ppp.c
      229aebb8
    • L
      Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac · 8de547e1
      Linus Torvalds 提交于
      * 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
        i7300_edac: Properly initialize per-csrow memory size
        V4L/DVB: i7300_edac: better initialize page counts
        MAINTAINERS: Add maintainer for i7300-edac driver
        i7300-edac: CodingStyle cleanup
        i7300_edac: Improve comments
        i7300_edac: Cleanup: reorganize the file contents
        i7300_edac: Properly detect channel on CE errors
        i7300_edac: enrich FBD error info for corrected errors
        i7300_edac: enrich FBD error info for fatal errors
        i7300_edac: pre-allocate a buffer used to prepare err messages
        i7300_edac: Fix MTR x4/x8 detection logic
        i7300_edac: Make the debug messages coherent with the others
        i7300_edac: Cleanup: remove get_error_info logic
        i7300_edac: Add a code to cleanup error registers
        i7300_edac: Add support for reporting FBD errors
        i7300_edac: Properly detect the type of error correction
        i7300_edac: Detect if the device is on single mode
        i7300_edac: Adds detection for enhanced scrub mode on x8
        i7300_edac: Clear the error bit after reading
        i7300_edac: Add error detection code for global errors
        ...
      8de547e1
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 76c39e4f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: (27 commits)
        SLUB: Fix memory hotplug with !NUMA
        slub: Move functions to reduce #ifdefs
        slub: Enable sysfs support for !CONFIG_SLUB_DEBUG
        SLUB: Optimize slab_free() debug check
        slub: Move NUMA-related functions under CONFIG_NUMA
        slub: Add lock release annotation
        slub: Fix signedness warnings
        slub: extract common code to remove objects from partial list without locking
        SLUB: Pass active and inactive redzone flags instead of boolean to debug functions
        slub: reduce differences between SMP and NUMA
        Revert "Slub: UP bandaid"
        percpu: clear memory allocated with the km allocator
        percpu: use percpu allocator on UP too
        percpu: reduce PCPU_MIN_UNIT_SIZE to 32k
        vmalloc: pcpu_get/free_vm_areas() aren't needed on UP
        SLUB: Fix merged slab cache names
        Slub: UP bandaid
        slub: fix SLUB_RESILIENCY_TEST for dynamic kmalloc caches
        slub: Fix up missing kmalloc_cache -> kmem_cache_node case for memoryhotplug
        slub: Add dummy functions for the !SLUB_DEBUG case
        ...
      76c39e4f
    • L
      Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 1765a1fe
      Linus Torvalds 提交于
      * 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (321 commits)
        KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages
        KVM: Fix signature of kvm_iommu_map_pages stub
        KVM: MCE: Send SRAR SIGBUS directly
        KVM: MCE: Add MCG_SER_P into KVM_MCE_CAP_SUPPORTED
        KVM: fix typo in copyright notice
        KVM: Disable interrupts around get_kernel_ns()
        KVM: MMU: Avoid sign extension in mmu_alloc_direct_roots() pae root address
        KVM: MMU: move access code parsing to FNAME(walk_addr) function
        KVM: MMU: audit: check whether have unsync sps after root sync
        KVM: MMU: audit: introduce audit_printk to cleanup audit code
        KVM: MMU: audit: unregister audit tracepoints before module unloaded
        KVM: MMU: audit: fix vcpu's spte walking
        KVM: MMU: set access bit for direct mapping
        KVM: MMU: cleanup for error mask set while walk guest page table
        KVM: MMU: update 'root_hpa' out of loop in PAE shadow path
        KVM: x86 emulator: Eliminate compilation warning in x86_decode_insn()
        KVM: x86: Fix constant type in kvm_get_time_scale
        KVM: VMX: Add AX to list of registers clobbered by guest switch
        KVM guest: Move a printk that's using the clock before it's ready
        KVM: x86: TSC catchup mode
        ...
      1765a1fe
    • L
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · bdaf12b4
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-viapro: Don't log nacks
        i2c/pca954x: Remove __devinit and __devexit from probe and remove functions
        MAINTAINERS: Add maintainer for PCA9541 I2C bus master selector driver
        i2c/mux: Driver for PCA9541 I2C Master Selector
        i2c: Optimize function i2c_detect()
        i2c: Discard warning message on device instantiation from user-space
        i2c-amd8111: Add proper error handling
        i2c: Change to new flag variable
        i2c: Remove unneeded inclusions of <linux/i2c-id.h>
        i2c: Let i2c_parent_is_i2c_adapter return the parent adapter
        i2c: Simplify i2c_parent_is_i2c_adapter
        i2c-pca-platform: Change device name of request_irq
        i2c: Fix Kconfig dependencies
      bdaf12b4
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7c024e95
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (47 commits)
        HID: fix mismerge in hid-lg
        HID: hidraw: fix window in hidraw_release
        HID: hid-sony: override usbhid_output_raw_report for Sixaxis
        HID: add absolute axis resolution calculation
        HID: force feedback support for Logitech RumblePad gamepad
        HID: support STmicroelectronics and Sitronix with hid-stantuml driver
        HID: magicmouse: Adjust major / minor axes to scale
        HID: Fix for problems with eGalax/DWAV multi-touch-screen
        HID: waltop: add support for Waltop Slim Tablet 12.1 inch
        HID: add NOGET quirk for AXIS 295 Video Surveillance Joystick
        HID: usbhid: remove unused hiddev_driver
        HID: magicmouse: Use hid-input parsing rather than bypassing it
        HID: trivial formatting fix
        HID: Add support for Logitech Speed Force Wireless gaming wheel
        HID: don't Send Feature Reports on Interrupt Endpoint
        HID: 3m: Adjust major / minor axes to scale
        HID: 3m: Correct touchscreen emulation
        HID: 3m: Convert to MT slots
        HID: 3m: Output proper orientation range
        HID: 3m: Adjust to sequential MT HID protocol
        ...
      7c024e95