public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation
@ 2021-05-20  7:31 Daniel Wagner
  2021-05-21 20:58 ` Martin K. Petersen
  2021-05-26  4:07 ` Martin K. Petersen
  0 siblings, 2 replies; 3+ messages in thread
From: Daniel Wagner @ 2021-05-20  7:31 UTC (permalink / raw)
  To: linux-scsi
  Cc: linux-kernel, Martin K . Petersen, Daniel Wagner, Hannes Reinecke

Remove the double listed FC_FPORT_DELETING from the mask creation.

Commit 260f4aeddb48 ("scsi: scsi_transport_fc: return -EBUSY for
deleted vport") added VC_VPORT_DELETING to the flag masks. This is not
necessary as FC_FPORT_DEL is defined as VC_FPORT_DELETED |
FC_FPORT_DELETING.

Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 drivers/scsi/scsi_transport_fc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index da5b503dc7a1..49748cd817a5 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -1686,7 +1686,7 @@ store_fc_vport_delete(struct device *dev, struct device_attribute *attr,
 	unsigned long flags;
 
 	spin_lock_irqsave(shost->host_lock, flags);
-	if (vport->flags & (FC_VPORT_DEL | FC_VPORT_CREATING | FC_VPORT_DELETING)) {
+	if (vport->flags & (FC_VPORT_DEL | FC_VPORT_CREATING)) {
 		spin_unlock_irqrestore(shost->host_lock, flags);
 		return -EBUSY;
 	}
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation
  2021-05-20  7:31 [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation Daniel Wagner
@ 2021-05-21 20:58 ` Martin K. Petersen
  2021-05-26  4:07 ` Martin K. Petersen
  1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2021-05-21 20:58 UTC (permalink / raw)
  To: Daniel Wagner
  Cc: linux-scsi, linux-kernel, Martin K . Petersen, Hannes Reinecke


Daniel,

> Remove the double listed FC_FPORT_DELETING from the mask creation.
>
> Commit 260f4aeddb48 ("scsi: scsi_transport_fc: return -EBUSY for
> deleted vport") added VC_VPORT_DELETING to the flag masks. This is not
> necessary as FC_FPORT_DEL is defined as VC_FPORT_DELETED |
> FC_FPORT_DELETING.

Applied to 5.14/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation
  2021-05-20  7:31 [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation Daniel Wagner
  2021-05-21 20:58 ` Martin K. Petersen
@ 2021-05-26  4:07 ` Martin K. Petersen
  1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2021-05-26  4:07 UTC (permalink / raw)
  To: Daniel Wagner, linux-scsi
  Cc: Martin K . Petersen, Hannes Reinecke, linux-kernel

On Thu, 20 May 2021 09:31:27 +0200, Daniel Wagner wrote:

> Remove the double listed FC_FPORT_DELETING from the mask creation.
> 
> Commit 260f4aeddb48 ("scsi: scsi_transport_fc: return -EBUSY for
> deleted vport") added VC_VPORT_DELETING to the flag masks. This is not
> necessary as FC_FPORT_DEL is defined as VC_FPORT_DELETED |
> FC_FPORT_DELETING.

Applied to 5.14/scsi-queue, thanks!

[1/1] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation
      https://git.kernel.org/mkp/scsi/c/faa6c1d92cb0

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-05-26  4:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-20  7:31 [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation Daniel Wagner
2021-05-21 20:58 ` Martin K. Petersen
2021-05-26  4:07 ` Martin K. Petersen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox