Merge branch 'next' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / target / iscsi / iscsi_target_util.c

diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index b18edda3e8af8a6f4b6edba747dbf725bf36a21a..a2bff0702eb25bc4d10bac935d4888b2df131c41 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -22,7 +22,6 @@
 #include <scsi/iscsi_proto.h>
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
-#include <target/target_core_configfs.h>
 #include <target/iscsi/iscsi_transport.h>
 
 #include <target/iscsi/iscsi_target_core.h>
@@ -746,7 +745,7 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown)
                rc = transport_generic_free_cmd(&cmd->se_cmd, shutdown);
                if (!rc && shutdown && se_cmd && se_cmd->se_sess) {
                        __iscsit_free_cmd(cmd, true, shutdown);
-                       target_put_sess_cmd(se_cmd->se_sess, se_cmd);
+                       target_put_sess_cmd(se_cmd);
                }
                break;
        case ISCSI_OP_REJECT:
@@ -762,7 +761,7 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown)
                        rc = transport_generic_free_cmd(&cmd->se_cmd, shutdown);
                        if (!rc && shutdown && se_cmd->se_sess) {
                                __iscsit_free_cmd(cmd, true, shutdown);
-                               target_put_sess_cmd(se_cmd->se_sess, se_cmd);
+                               target_put_sess_cmd(se_cmd);
                        }
                        break;
                }
@@ -809,54 +808,6 @@ void iscsit_inc_session_usage_count(struct iscsi_session *sess)
        spin_unlock_bh(&sess->session_usage_lock);
 }
 
-/*
- *     Setup conn->if_marker and conn->of_marker values based upon
- *     the initial marker-less interval. (see iSCSI v19 A.2)
- */
-int iscsit_set_sync_and_steering_values(struct iscsi_conn *conn)
-{
-       int login_ifmarker_count = 0, login_ofmarker_count = 0, next_marker = 0;
-       /*
-        * IFMarkInt and OFMarkInt are negotiated as 32-bit words.
-        */
-       u32 IFMarkInt = (conn->conn_ops->IFMarkInt * 4);
-       u32 OFMarkInt = (conn->conn_ops->OFMarkInt * 4);
-
-       if (conn->conn_ops->OFMarker) {
-               /*
-                * Account for the first Login Command received not
-                * via iscsi_recv_msg().
-                */
-               conn->of_marker += ISCSI_HDR_LEN;
-               if (conn->of_marker <= OFMarkInt) {
-                       conn->of_marker = (OFMarkInt - conn->of_marker);
-               } else {
-                       login_ofmarker_count = (conn->of_marker / OFMarkInt);
-                       next_marker = (OFMarkInt * (login_ofmarker_count + 1)) +
-                                       (login_ofmarker_count * MARKER_SIZE);
-                       conn->of_marker = (next_marker - conn->of_marker);
-               }
-               conn->of_marker_offset = 0;
-               pr_debug("Setting OFMarker value to %u based on Initial"
-                       " Markerless Interval.\n", conn->of_marker);
-       }
-
-       if (conn->conn_ops->IFMarker) {
-               if (conn->if_marker <= IFMarkInt) {
-                       conn->if_marker = (IFMarkInt - conn->if_marker);
-               } else {
-                       login_ifmarker_count = (conn->if_marker / IFMarkInt);
-                       next_marker = (IFMarkInt * (login_ifmarker_count + 1)) +
-                                       (login_ifmarker_count * MARKER_SIZE);
-                       conn->if_marker = (next_marker - conn->if_marker);
-               }
-               pr_debug("Setting IFMarker value to %u based on Initial"
-                       " Markerless Interval.\n", conn->if_marker);
-       }
-
-       return 0;
-}
-
 struct iscsi_conn *iscsit_get_conn_from_cid(struct iscsi_session *sess, u16 cid)
 {
        struct iscsi_conn *conn;