2021-05-20 07:32:34

by Daniel Wagner

Subject: [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation

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 <[email protected]>
Signed-off-by: Daniel Wagner <[email protected]>
---
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

2021-05-21 21:00:31

by Martin K. Petersen

Subject: Re: [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation

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

2021-05-26 04:32:16

by Martin K. Petersen

Subject: Re: [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation

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