Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9b8af00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (154 commits)
  [SCSI] osd: Remove out-of-tree left overs
  [SCSI] libosd: Use REQ_QUIET requests.
  [SCSI] osduld: use filp_open() when looking up an osd-device
  [SCSI] libosd: Define an osd_dev wrapper to retrieve the request_queue
  [SCSI] libosd: osd_req_{read,write} takes a length parameter
  [SCSI] libosd: Let _osd_req_finalize_data_integrity receive number of out_bytes
  [SCSI] libosd: osd_req_{read,write}_kern new API
  [SCSI] libosd: Better printout of OSD target system information
  [SCSI] libosd: OSD2r05: Attribute definitions
  [SCSI] libosd: OSD2r05: Additional command enums
  [SCSI] mpt fusion: fix up doc book comments
  [SCSI] mpt fusion: Added support for Broadcast primitives Event handling
  [SCSI] mpt fusion: Queue full event handling
  [SCSI] mpt fusion: RAID device handling and Dual port Raid support is added
  [SCSI] mpt fusion: Put IOC into ready state if it not already in ready state
  [SCSI] mpt fusion: Code Cleanup patch
  [SCSI] mpt fusion: Rescan SAS topology added
  [SCSI] mpt fusion: SAS topology scan changes, expander events
  [SCSI] mpt fusion: Firmware event implementation using seperate WorkQueue
  [SCSI] mpt fusion: rewrite of ioctl_cmds internal generated function
  ...
parents c59a264c 82681a31

drivers/infiniband/ulp/iser/iscsi_iser.c

+4 −6
Original line number Diff line number Diff line
@@ -257,11 +257,8 @@ static void iscsi_iser_cleanup_task(struct iscsi_task *task) 
{

	struct iscsi_iser_task *iser_task = task->dd_data;



	/*

	 * mgmt tasks do not need special cleanup and we do not

	 * allocate anything in the init task callout

	 */

	if (!task->sc || task->state == ISCSI_TASK_PENDING)

	/* mgmt tasks do not need special cleanup */

	if (!task->sc)

		return;



	if (iser_task->status == ISER_TASK_STATUS_STARTED) {
@@ -517,7 +514,8 @@ iscsi_iser_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *s 
}



static struct iscsi_endpoint *

iscsi_iser_ep_connect(struct sockaddr *dst_addr, int non_blocking)

iscsi_iser_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,

		      int non_blocking)

{

	int err;

	struct iser_conn *ib_conn;