nvmet-fc: remove redundant del_work_active flag

The transport has a del_work_active flag to avoid duplicate scheduling
of the del_work item. This is redundant with the checks that
schedule_work() makes.

Remove the del_work_active flag.

Signed-off-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index c15356b..55bafd5 100644 (file)
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -167,7 +167,6 @@ struct nvmet_fc_tgt_assoc {
        struct nvmet_fc_tgt_queue       *queues[NVMET_NR_QUEUES + 1];
        struct kref                     ref;
        struct work_struct              del_work;
-       atomic_t                        del_work_active;
 };
 
 
@@ -1090,7 +1089,6 @@ nvmet_fc_delete_assoc(struct work_struct *work)
                container_of(work, struct nvmet_fc_tgt_assoc, del_work);
 
        nvmet_fc_delete_target_assoc(assoc);
-       atomic_set(&assoc->del_work_active, 0);
        nvmet_fc_tgt_a_put(assoc);
 }
 
@@ -1123,7 +1121,6 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle)
        INIT_LIST_HEAD(&assoc->a_list);
        kref_init(&assoc->ref);
        INIT_WORK(&assoc->del_work, nvmet_fc_delete_assoc);
-       atomic_set(&assoc->del_work_active, 0);
        atomic_set(&assoc->terminating, 0);
 
        while (needrandom) {
@@ -1478,21 +1475,15 @@ __nvmet_fc_free_assocs(struct nvmet_fc_tgtport *tgtport)
 {
        struct nvmet_fc_tgt_assoc *assoc, *next;
        unsigned long flags;
-       int ret;
 
        spin_lock_irqsave(&tgtport->lock, flags);
        list_for_each_entry_safe(assoc, next,
                                &tgtport->assoc_list, a_list) {
                if (!nvmet_fc_tgt_a_get(assoc))
                        continue;
-               ret = atomic_cmpxchg(&assoc->del_work_active, 0, 1);
-               if (ret == 0) {
-                       if (!schedule_work(&assoc->del_work))
-                               nvmet_fc_tgt_a_put(assoc);
-               } else {
+               if (!schedule_work(&assoc->del_work))
                        /* already deleting - release local reference */
                        nvmet_fc_tgt_a_put(assoc);
-               }
        }
        spin_unlock_irqrestore(&tgtport->lock, flags);
 }
@@ -1534,7 +1525,6 @@ nvmet_fc_invalidate_host(struct nvmet_fc_target_port *target_port,
        struct nvmet_fc_tgt_assoc *assoc, *next;
        unsigned long flags;
        bool noassoc = true;
-       int ret;
 
        spin_lock_irqsave(&tgtport->lock, flags);
        list_for_each_entry_safe(assoc, next,
@@ -1546,14 +1536,9 @@ nvmet_fc_invalidate_host(struct nvmet_fc_target_port *target_port,
                        continue;
                assoc->hostport->invalid = 1;
                noassoc = false;
-               ret = atomic_cmpxchg(&assoc->del_work_active, 0, 1);
-               if (ret == 0) {
-                       if (!schedule_work(&assoc->del_work))
-                               nvmet_fc_tgt_a_put(assoc);
-               } else {
+               if (!schedule_work(&assoc->del_work))
                        /* already deleting - release local reference */
                        nvmet_fc_tgt_a_put(assoc);
-               }
        }
        spin_unlock_irqrestore(&tgtport->lock, flags);
 
@@ -1574,7 +1559,6 @@ nvmet_fc_delete_ctrl(struct nvmet_ctrl *ctrl)
        struct nvmet_fc_tgt_queue *queue;
        unsigned long flags;
        bool found_ctrl = false;
-       int ret;
 
        /* this is a bit ugly, but don't want to make locks layered */
        spin_lock_irqsave(&nvmet_fc_tgtlock, flags);
@@ -1598,14 +1582,9 @@ nvmet_fc_delete_ctrl(struct nvmet_ctrl *ctrl)
                nvmet_fc_tgtport_put(tgtport);
 
                if (found_ctrl) {
-                       ret = atomic_cmpxchg(&assoc->del_work_active, 0, 1);
-                       if (ret == 0) {
-                               if (!schedule_work(&assoc->del_work))
-                                       nvmet_fc_tgt_a_put(assoc);
-                       } else {
+                       if (!schedule_work(&assoc->del_work))
                                /* already deleting - release local reference */
                                nvmet_fc_tgt_a_put(assoc);
-                       }
                        return;
                }