mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-07-30 03:52:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Revert "Increase tgt_dev_cmd_count by one" (r8465)

Browse Source 
Because of the previous patch, r8465 is no longer necessary.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8518 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-08-23 03:44:52 +00:00
parent 92c6e461f0
commit 398d41e753
5 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/scst.h
+2 -2
View File
@@ -3161,7 +3161,7 @@ struct scst_tgt_dev {
*/ */
int tgt_dev_dif_guard_format; int tgt_dev_dif_guard_format;
/* One more than the number of commands associated with this tgt_dev. */ /* How many cmds alive on this dev in this session */
atomic_t tgt_dev_cmd_count ____cacheline_aligned_in_smp; atomic_t tgt_dev_cmd_count ____cacheline_aligned_in_smp;
/* ALUA command filter */ /* ALUA command filter */
@@ -4781,7 +4781,7 @@ static inline int scst_cmd_get_block_size(struct scst_cmd *cmd)
static inline unsigned int scst_get_active_cmd_count(struct scst_cmd *cmd) static inline unsigned int scst_get_active_cmd_count(struct scst_cmd *cmd)
{ {
if (likely(cmd->tgt_dev != NULL)) if (likely(cmd->tgt_dev != NULL))
return atomic_read(&cmd->tgt_dev->tgt_dev_cmd_count) - 1; return atomic_read(&cmd->tgt_dev->tgt_dev_cmd_count);
else else
return (unsigned int)-1; return (unsigned int)-1;
} }
scst/src/scst_lib.c
+1 -3
View File
@@ -5359,7 +5359,7 @@ static int scst_alloc_add_tgt_dev(struct scst_session *sess,
atomic_set(&tgt_dev->tgt_dev_dif_guard_failed_dev, 0); atomic_set(&tgt_dev->tgt_dev_dif_guard_failed_dev, 0);
tgt_dev->sess = sess; tgt_dev->sess = sess;
atomic_set(&tgt_dev->tgt_dev_cmd_count, 1); atomic_set(&tgt_dev->tgt_dev_cmd_count, 0);
if (acg_dev->acg->acg_black_hole_type != SCST_ACG_BLACK_HOLE_NONE) if (acg_dev->acg->acg_black_hole_type != SCST_ACG_BLACK_HOLE_NONE)
set_bit(SCST_TGT_DEV_BLACK_HOLE, &tgt_dev->tgt_dev_flags); set_bit(SCST_TGT_DEV_BLACK_HOLE, &tgt_dev->tgt_dev_flags);
else else
@@ -5538,8 +5538,6 @@ static void scst_del_tgt_dev(struct scst_tgt_dev *tgt_dev)
list_del_rcu(&tgt_dev->sess_tgt_dev_list_entry); list_del_rcu(&tgt_dev->sess_tgt_dev_list_entry);
scst_tgt_dev_sysfs_del(tgt_dev); scst_tgt_dev_sysfs_del(tgt_dev);
atomic_dec(&tgt_dev->tgt_dev_cmd_count);
} }
/* /*
scst/src/scst_pres.c
+1 -1
View File
@@ -607,7 +607,7 @@ static void scst_pr_abort_reg(struct scst_device *dev,
TRACE_PR("Aborting %d commands for %s/%d (reg %p, key 0x%016llx, " TRACE_PR("Aborting %d commands for %s/%d (reg %p, key 0x%016llx, "
"tgt_dev %p, sess %p)", "tgt_dev %p, sess %p)",
atomic_read(&reg->tgt_dev->tgt_dev_cmd_count) - 1, atomic_read(&reg->tgt_dev->tgt_dev_cmd_count),
debug_transport_id_to_initiator_name(reg->transport_id), debug_transport_id_to_initiator_name(reg->transport_id),
reg->rel_tgt_id, reg, be64_to_cpu(reg->key), reg->tgt_dev, reg->rel_tgt_id, reg, be64_to_cpu(reg->key), reg->tgt_dev,
sess); sess);
scst/src/scst_sysfs.c
+1 -3
View File
@@ -4154,8 +4154,7 @@ static ssize_t scst_tgt_dev_active_commands_show(struct kobject *kobj,
tgt_dev = container_of(kobj, struct scst_tgt_dev, tgt_dev_kobj); tgt_dev = container_of(kobj, struct scst_tgt_dev, tgt_dev_kobj);
pos = sprintf(buf, "%d\n", pos = sprintf(buf, "%d\n", atomic_read(&tgt_dev->tgt_dev_cmd_count));
atomic_read(&tgt_dev->tgt_dev_cmd_count) - 1);
return pos; return pos;
} }
@@ -4489,7 +4488,6 @@ static int scst_sysfs_sess_get_active_commands(struct scst_session *sess)
list_for_each_entry_rcu(tgt_dev, head, list_for_each_entry_rcu(tgt_dev, head,
sess_tgt_dev_list_entry) { sess_tgt_dev_list_entry) {
active_cmds += atomic_read(&tgt_dev->tgt_dev_cmd_count); active_cmds += atomic_read(&tgt_dev->tgt_dev_cmd_count);
active_cmds--;
} }
} }
rcu_read_unlock(); rcu_read_unlock();
scst/src/scst_targ.c
+2 -3
View File
@@ -5027,9 +5027,8 @@ static int scst_translate_lun(struct scst_cmd *cmd)
rcu_read_lock(); rcu_read_lock();
tgt_dev = scst_lookup_tgt_dev(cmd->sess, cmd->lun); tgt_dev = scst_lookup_tgt_dev(cmd->sess, cmd->lun);
if (tgt_dev && if (tgt_dev)
!atomic_inc_not_zero(&tgt_dev->tgt_dev_cmd_count)) atomic_inc(&tgt_dev->tgt_dev_cmd_count);
tgt_dev = NULL;
rcu_read_unlock(); rcu_read_unlock();
if (tgt_dev) { if (tgt_dev) {