From 4be89da33b44a30c9397f831428d395eb56d1fd5 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <tomof@acm.org>
Date: Wed, 11 Jul 2007 15:08:22 +0900
Subject: [PATCH] --- yaml --- r: 68804 b: refs/heads/master c:
 bfb743740e1598d3030c4972a8808f2bb5b95b6b h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/scsi/scsi_tgt_lib.c       |  2 +-
 trunk/drivers/scsi/scsi_transport_srp.c | 12 ++++++++++--
 trunk/include/scsi/scsi_host.h          |  3 ---
 trunk/include/scsi/scsi_transport.h     |  6 ++++++
 trunk/include/scsi/scsi_transport_srp.h |  1 +
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 858bfd610f6a..b13cc12a48b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b0bcfad795913b1f2a3926cd238fa2ad5522a2
+refs/heads/master: bfb743740e1598d3030c4972a8808f2bb5b95b6b
diff --git a/trunk/drivers/scsi/scsi_tgt_lib.c b/trunk/drivers/scsi/scsi_tgt_lib.c
index fa79e54722db..5851c8e53e40 100644
--- a/trunk/drivers/scsi/scsi_tgt_lib.c
+++ b/trunk/drivers/scsi/scsi_tgt_lib.c
@@ -577,7 +577,7 @@ int scsi_tgt_kspace_tsk_mgmt(int host_no, u64 itn_id, u64 mid, int result)
 		goto done;
 	}
 
-	err = shost->hostt->tsk_mgmt_response(shost, itn_id, mid, result);
+	err = shost->transportt->tsk_mgmt_response(shost, itn_id, mid, result);
 done:
 	scsi_host_put(shost);
 	return err;
diff --git a/trunk/drivers/scsi/scsi_transport_srp.c b/trunk/drivers/scsi/scsi_transport_srp.c
index 8e5b41ca181d..cdd001a6639c 100644
--- a/trunk/drivers/scsi/scsi_transport_srp.c
+++ b/trunk/drivers/scsi/scsi_transport_srp.c
@@ -280,10 +280,17 @@ void srp_remove_host(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL_GPL(srp_remove_host);
 
-static int srp_it_nexus_response(struct Scsi_Host *shost, u64 id, int result)
+static int srp_tsk_mgmt_response(struct Scsi_Host *shost, u64 nexus, u64 tm_id,
+				 int result)
 {
 	struct srp_internal *i = to_srp_internal(shost->transportt);
-	return i->f->it_nexus_response(shost, id, result);
+	return i->f->tsk_mgmt_response(shost, nexus, tm_id, result);
+}
+
+static int srp_it_nexus_response(struct Scsi_Host *shost, u64 nexus, int result)
+{
+	struct srp_internal *i = to_srp_internal(shost->transportt);
+	return i->f->it_nexus_response(shost, nexus, result);
 }
 
 /**
@@ -300,6 +307,7 @@ srp_attach_transport(struct srp_function_template *ft)
 	if (!i)
 		return NULL;
 
+	i->t.tsk_mgmt_response = srp_tsk_mgmt_response;
 	i->t.it_nexus_response = srp_it_nexus_response;
 
 	i->t.host_size = sizeof(struct srp_host_attrs);
diff --git a/trunk/include/scsi/scsi_host.h b/trunk/include/scsi/scsi_host.h
index 89c40c4bd5c4..88f6871badd8 100644
--- a/trunk/include/scsi/scsi_host.h
+++ b/trunk/include/scsi/scsi_host.h
@@ -145,9 +145,6 @@ struct scsi_host_template {
 	int (* transfer_response)(struct scsi_cmnd *,
 				  void (*done)(struct scsi_cmnd *));
 
-	/* Used as callback for the completion of task management request. */
-	int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64 mid, int result);
-
 	/*
 	 * This is an error handling strategy routine.  You don't need to
 	 * define one of these if you don't want to - there is a default
diff --git a/trunk/include/scsi/scsi_transport.h b/trunk/include/scsi/scsi_transport.h
index af5b3e15e64e..0dfef752f0e2 100644
--- a/trunk/include/scsi/scsi_transport.h
+++ b/trunk/include/scsi/scsi_transport.h
@@ -71,6 +71,12 @@ struct scsi_transport_template {
 	 * for target drivers.
 	 */
 	int (* it_nexus_response)(struct Scsi_Host *, u64, int);
+
+	/*
+	 * Used as callback for the completion of task management
+	 * request for target drivers.
+	 */
+	int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
 };
 
 #define transport_class_to_shost(tc) \
diff --git a/trunk/include/scsi/scsi_transport_srp.h b/trunk/include/scsi/scsi_transport_srp.h
index a705dbc016b3..9c60ca1c08c5 100644
--- a/trunk/include/scsi/scsi_transport_srp.h
+++ b/trunk/include/scsi/scsi_transport_srp.h
@@ -22,6 +22,7 @@ struct srp_rport {
 
 struct srp_function_template {
 	/* for target drivers */
+	int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
 	int (* it_nexus_response)(struct Scsi_Host *, u64, int);
 };