From: James Smart <jsmart2021@gmail.com>

Date: Tue, 31 Mar 2020 09:49:56 -0700

Subject: [PATCH] nvmet-fc: perform small cleanups on unneeded checks

Git-commit: e72914f70db194d98ade0711b088fd062a72c033

Git-repo: git://git.infradead.org/nvme.git

Patch-mainline: Queued in subsystem maintainer repository

References: bsc#1169045

While code reviewing saw a couple of items that can be cleaned up:

- In nvmet_fc_delete_target_queue(), the routine unlocks, then checks

  and relocks.  Reorganize to avoid the unlock/relock.

- In nvmet_fc_delete_target_queue(), there's a check on the disconnect

  state that is unnecessary as the routine validates the state before

  starting any action.

Signed-off-by: James Smart <jsmart2021@gmail.com>

Signed-off-by: Christoph Hellwig <hch@lst.de>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/nvme/target/fc.c | 13 +++++--------

 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c

index a91c443c9098..01488fc35d46 100644

--- a/drivers/nvme/target/fc.c

+++ b/drivers/nvme/target/fc.c

@@ -677,7 +677,7 @@ nvmet_fc_delete_target_queue(struct nvmet_fc_tgt_queue *queue)

 	struct nvmet_fc_fcp_iod *fod = queue->fod;

 	struct nvmet_fc_defer_fcp_req *deferfcp, *tempptr;

 	unsigned long flags;

-	int i, writedataactive;

+	int i;

 	bool disconnect;

 	disconnect = atomic_xchg(&queue->connected, 0);

@@ -688,20 +688,18 @@ nvmet_fc_delete_target_queue(struct nvmet_fc_tgt_queue *queue)

 		if (fod->active) {

 			spin_lock(&fod->flock);

 			fod->abort = true;

-			writedataactive = fod->writedataactive;

-			spin_unlock(&fod->flock);

 			/*

 			 * only call lldd abort routine if waiting for

 			 * writedata. other outstanding ops should finish

 			 * on their own.

 			 */

-			if (writedataactive) {

-				spin_lock(&fod->flock);

+			if (fod->writedataactive) {

 				fod->aborted = true;

 				spin_unlock(&fod->flock);

 				tgtport->ops->fcp_abort(

 					&tgtport->fc_target_port, fod->fcpreq);

-			}

+			} else

+				spin_unlock(&fod->flock);

 		}

 	}

@@ -741,8 +739,7 @@ nvmet_fc_delete_target_queue(struct nvmet_fc_tgt_queue *queue)

 	flush_workqueue(queue->work_q);

-	if (disconnect)

-		nvmet_sq_destroy(&queue->nvme_sq);

+	nvmet_sq_destroy(&queue->nvme_sq);

 	nvmet_fc_tgt_q_put(queue);

 }

-- 

2.16.4