Merge tag 'tags/bcm2835-dt-next-2019-03-04' into devicetree/fixes

[sfrench/cifs-2.6.git] / drivers / target / iscsi / iscsi_target_configfs.c

diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index a5481dfeae8db2e431ef826d0160e741c71d0aae..cac94c94ef5d4bdd27db52c4a5c4b68cba9040fe 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1389,18 +1389,6 @@ static int lio_write_pending(struct se_cmd *se_cmd)
        return 0;
 }
 
-static int lio_write_pending_status(struct se_cmd *se_cmd)
-{
-       struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
-       int ret;
-
-       spin_lock_bh(&cmd->istate_lock);
-       ret = !(cmd->cmd_flags & ICF_GOT_LAST_DATAOUT);
-       spin_unlock_bh(&cmd->istate_lock);
-
-       return ret;
-}
-
 static int lio_queue_status(struct se_cmd *se_cmd)
 {
        struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
@@ -1564,7 +1552,6 @@ const struct target_core_fabric_ops iscsi_ops = {
        .sess_get_index                 = lio_sess_get_index,
        .sess_get_initiator_sid         = lio_sess_get_initiator_sid,
        .write_pending                  = lio_write_pending,
-       .write_pending_status           = lio_write_pending_status,
        .set_default_node_attributes    = lio_set_default_node_attributes,
        .get_cmd_state                  = iscsi_get_cmd_state,
        .queue_data_in                  = lio_queue_data_in,