1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 1c59a3c23b2c..c6e0293ffdb0 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -3,8 +3,7 @@
  *
  * This file contains SPC-3 task management infrastructure
  *
- * Copyright (c) 2009,2010 Rising Tide Systems
- * Copyright (c) 2009,2010 Linux-iSCSI.org
+ * (c) Copyright 2009-2012 RisingTide Systems LLC.
  *
  * Nicholas A. Bellinger <nab@kernel.org>
  *
@@ -140,15 +139,15 @@ void core_tmr_abort_task(
                 printk("ABORT_TASK: Found referenced %s task_tag: %u\n",
                         se_cmd->se_tfo->get_fabric_name(), ref_tag);
 
-                spin_lock_irq(&se_cmd->t_state_lock);
+                spin_lock(&se_cmd->t_state_lock);
                 if (se_cmd->transport_state & CMD_T_COMPLETE) {
                         printk("ABORT_TASK: ref_tag: %u already complete, skipping\n", ref_tag);
-                        spin_unlock_irq(&se_cmd->t_state_lock);
+                        spin_unlock(&se_cmd->t_state_lock);
                         spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
                         goto out;
                 }
                 se_cmd->transport_state |= CMD_T_ABORTED;
-                spin_unlock_irq(&se_cmd->t_state_lock);
+                spin_unlock(&se_cmd->t_state_lock);
 
                 list_del_init(&se_cmd->se_cmd_list);
                 kref_get(&se_cmd->cmd_kref);
@@ -371,7 +370,7 @@ int core_tmr_lun_reset(
          * which the command was received shall be completed with TASK ABORTED
          * status (see SAM-4).
          */
-        tas = dev->se_sub_dev->se_dev_attrib.emulate_tas;
+        tas = dev->dev_attrib.emulate_tas;
         /*
          * Determine if this se_tmr is coming from a $FABRIC_MOD
          * or struct se_device passthrough..
@@ -399,10 +398,10 @@ int core_tmr_lun_reset(
          * LOGICAL UNIT RESET
          */
         if (!preempt_and_abort_list &&
-             (dev->dev_flags & DF_SPC2_RESERVATIONS)) {
+             (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)) {
                 spin_lock(&dev->dev_reservation_lock);
                 dev->dev_reserved_node_acl = NULL;
-                dev->dev_flags &= ~DF_SPC2_RESERVATIONS;
+                dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS;
                 spin_unlock(&dev->dev_reservation_lock);
                 pr_debug("LUN_RESET: SCSI-2 Released reservation\n");
         }