ソースを参照

IB/iser: Change minor assignments and logging prints

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Sagi Grimberg 10 年 前
コミット
74ce897b7c
1 ファイル変更4 行追加7 行削除
  1. 4 7
      drivers/infiniband/ulp/iser/iscsi_iser.c

+ 4 - 7
drivers/infiniband/ulp/iser/iscsi_iser.c

@@ -847,10 +847,9 @@ failure:
 static int
 static int
 iscsi_iser_ep_poll(struct iscsi_endpoint *ep, int timeout_ms)
 iscsi_iser_ep_poll(struct iscsi_endpoint *ep, int timeout_ms)
 {
 {
-	struct iser_conn *iser_conn;
+	struct iser_conn *iser_conn = ep->dd_data;
 	int rc;
 	int rc;
 
 
-	iser_conn = ep->dd_data;
 	rc = wait_for_completion_interruptible_timeout(&iser_conn->up_completion,
 	rc = wait_for_completion_interruptible_timeout(&iser_conn->up_completion,
 						       msecs_to_jiffies(timeout_ms));
 						       msecs_to_jiffies(timeout_ms));
 	/* if conn establishment failed, return error code to iscsi */
 	/* if conn establishment failed, return error code to iscsi */
@@ -862,7 +861,7 @@ iscsi_iser_ep_poll(struct iscsi_endpoint *ep, int timeout_ms)
 		mutex_unlock(&iser_conn->state_mutex);
 		mutex_unlock(&iser_conn->state_mutex);
 	}
 	}
 
 
-	iser_info("ib conn %p rc = %d\n", iser_conn, rc);
+	iser_info("iser conn %p rc = %d\n", iser_conn, rc);
 
 
 	if (rc > 0)
 	if (rc > 0)
 		return 1; /* success, this is the equivalent of POLLOUT */
 		return 1; /* success, this is the equivalent of POLLOUT */
@@ -884,11 +883,9 @@ iscsi_iser_ep_poll(struct iscsi_endpoint *ep, int timeout_ms)
 static void
 static void
 iscsi_iser_ep_disconnect(struct iscsi_endpoint *ep)
 iscsi_iser_ep_disconnect(struct iscsi_endpoint *ep)
 {
 {
-	struct iser_conn *iser_conn;
+	struct iser_conn *iser_conn = ep->dd_data;
 
 
-	iser_conn = ep->dd_data;
-	iser_info("ep %p iser conn %p state %d\n",
-		  ep, iser_conn, iser_conn->state);
+	iser_info("ep %p iser conn %p\n", ep, iser_conn);
 
 
 	mutex_lock(&iser_conn->state_mutex);
 	mutex_lock(&iser_conn->state_mutex);
 	iser_conn_terminate(iser_conn);
 	iser_conn_terminate(iser_conn);