diff mbox series

scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation

Message ID 20210520073127.132456-1-dwagner@suse.de (mailing list archive)
State Accepted
Headers show
Series scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation | expand

Commit Message

Daniel Wagner May 20, 2021, 7:31 a.m. UTC
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(-)

Comments

Martin K. Petersen May 21, 2021, 8:58 p.m. UTC | #1
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 May 26, 2021, 4:07 a.m. UTC | #2
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
diff mbox series

Patch

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;
 	}