From: Daniel Wagner Date: Thu, 20 May 2021 07:31:27 +0000 (+0200) Subject: scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation X-Git-Tag: accepted/tizen/unified/20230118.172025~6832^2~228 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faa6c1d92cb0d2a377cc4ca68a3f273e3355e4b3;p=platform%2Fkernel%2Flinux-rpi.git 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. Link: https://lore.kernel.org/r/20210520073127.132456-1-dwagner@suse.de Cc: Hannes Reinecke Signed-off-by: Daniel Wagner Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index da5b503..49748cd 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; }