tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] qlogicpti: fix sg list traversal error in continuation entries
[SCSI] Fix hang with split requests
[SCSI] qla2xxx: Defer enablement of RISC interrupts until ISP initialization completes.

Linus Torvalds 0d0f3ef2 17c0d2a1

+4 -2
-1
drivers/scsi/qla2xxx/qla_isr.c
··· 1834 1834 WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_HOST_INT); 1835 1835 } 1836 1836 spin_unlock_irq(&ha->hardware_lock); 1837 - ha->isp_ops->enable_intrs(ha); 1838 1837 1839 1838 fail: 1840 1839 return ret;
+2
drivers/scsi/qla2xxx/qla_os.c
··· 1740 1740 if (ret) 1741 1741 goto probe_failed; 1742 1742 1743 + ha->isp_ops->enable_intrs(ha); 1744 + 1743 1745 scsi_scan_host(host); 1744 1746 1745 1747 qla2x00_alloc_sysfs_attr(ha);
+2 -1
drivers/scsi/scsi_lib.c
··· 852 852 void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 853 853 { 854 854 int result = cmd->result; 855 - int this_count = scsi_bufflen(cmd); 855 + int this_count; 856 856 struct request_queue *q = cmd->device->request_queue; 857 857 struct request *req = cmd->request; 858 858 int error = 0; ··· 908 908 */ 909 909 if (scsi_end_request(cmd, error, good_bytes, result == 0) == NULL) 910 910 return; 911 + this_count = blk_rq_bytes(req); 911 912 912 913 /* good_bytes = 0, or (inclusive) there were leftovers and 913 914 * result = 0, so scsi_end_request couldn't retry.