diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2013-11-07 00:05:19 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2013-11-07 17:25:02 -0500 |
commit | 4a9a6c8d538eff6d627fa14409c7c25aff652541 (patch) | |
tree | dded7528c07556c7b666e8c4351ca0eeb9097c3d /include/target | |
parent | 5277797dc4ed873d067477d84e910b39d113f649 (diff) |
target: Drop left-over se_lun->lun_cmd_list shutdown code
Now with percpu refcounting for se_lun in place, go ahead and drop
the legacy per se_cmd accounting for se_lun shutdown.
This includes __transport_clear_lun_from_sessions(), the associated
transport_lun_wait_for_tasks() logic, along with a handful of now
unused se_cmd structure members and ->transport_state bits.
Cc: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'include/target')
-rw-r--r-- | include/target/target_core_base.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 4d16fd9330a6..1ad0a4240b00 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h | |||
@@ -443,7 +443,6 @@ struct se_cmd { | |||
443 | /* Used for sense data */ | 443 | /* Used for sense data */ |
444 | void *sense_buffer; | 444 | void *sense_buffer; |
445 | struct list_head se_delayed_node; | 445 | struct list_head se_delayed_node; |
446 | struct list_head se_lun_node; | ||
447 | struct list_head se_qf_node; | 446 | struct list_head se_qf_node; |
448 | struct se_device *se_dev; | 447 | struct se_device *se_dev; |
449 | struct se_dev_entry *se_deve; | 448 | struct se_dev_entry *se_deve; |
@@ -471,15 +470,11 @@ struct se_cmd { | |||
471 | #define CMD_T_SENT (1 << 4) | 470 | #define CMD_T_SENT (1 << 4) |
472 | #define CMD_T_STOP (1 << 5) | 471 | #define CMD_T_STOP (1 << 5) |
473 | #define CMD_T_FAILED (1 << 6) | 472 | #define CMD_T_FAILED (1 << 6) |
474 | #define CMD_T_LUN_STOP (1 << 7) | 473 | #define CMD_T_DEV_ACTIVE (1 << 7) |
475 | #define CMD_T_LUN_FE_STOP (1 << 8) | 474 | #define CMD_T_REQUEST_STOP (1 << 8) |
476 | #define CMD_T_DEV_ACTIVE (1 << 9) | 475 | #define CMD_T_BUSY (1 << 9) |
477 | #define CMD_T_REQUEST_STOP (1 << 10) | ||
478 | #define CMD_T_BUSY (1 << 11) | ||
479 | spinlock_t t_state_lock; | 476 | spinlock_t t_state_lock; |
480 | struct completion t_transport_stop_comp; | 477 | struct completion t_transport_stop_comp; |
481 | struct completion transport_lun_fe_stop_comp; | ||
482 | struct completion transport_lun_stop_comp; | ||
483 | 478 | ||
484 | struct work_struct work; | 479 | struct work_struct work; |
485 | 480 | ||
@@ -751,10 +746,8 @@ struct se_lun { | |||
751 | u32 unpacked_lun; | 746 | u32 unpacked_lun; |
752 | atomic_t lun_acl_count; | 747 | atomic_t lun_acl_count; |
753 | spinlock_t lun_acl_lock; | 748 | spinlock_t lun_acl_lock; |
754 | spinlock_t lun_cmd_lock; | ||
755 | spinlock_t lun_sep_lock; | 749 | spinlock_t lun_sep_lock; |
756 | struct completion lun_shutdown_comp; | 750 | struct completion lun_shutdown_comp; |
757 | struct list_head lun_cmd_list; | ||
758 | struct list_head lun_acl_list; | 751 | struct list_head lun_acl_list; |
759 | struct se_device *lun_se_dev; | 752 | struct se_device *lun_se_dev; |
760 | struct se_port *lun_sep; | 753 | struct se_port *lun_sep; |