Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2135796pxj; Thu, 20 May 2021 00:32:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCJ52RcoDaZjcWOwNLlRydPEjNYP/Qm8A24Y1+uZIz3/uIoGw76m4E1T3AHIL2NjJ1/pVZ X-Received: by 2002:a5d:8c84:: with SMTP id g4mr3705311ion.32.1621495954502; Thu, 20 May 2021 00:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621495954; cv=none; d=google.com; s=arc-20160816; b=z59eKc4EpnoTZcCbTx7mUOa0gGZhg76To7Cyp5/s7TjZYAEh5CMjf74p8MOzdL3Q+G b5sPUUeJ2OLDXaIt0ONRV8PUADgjeimLzrPDqToH6Ey3zqIionfSp47yQwvmZoYhWglO /mIgwpKgnPMUO+G+YHGUmoVy//G97jCXm3lT/1N4PwGb94CK7QVBXxU/W2pYHHtlvCRn AT7sapoxXdVr9eKMUDnIg5do6Sq6+dZm4FhdHOjHt0AHdSxV+WOIqFZ6P3kUmTJefblm RqZ8bPVKX1dQZi1QQ9pTQkaobkdgVkY4QyA311p+34Y1ivy193DXB+h6FRj5UUKBPzVM mozQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=39xNy39kaAUPYUgc3t5PWadxH44FPKQx52IKNpHG604=; b=MS98lwRp2dTkXn+1B4avtRn8w15wBnfy17ldvV8YvMmmv9bXJkTH7A12Jz4mb1ZUr0 yztQ+m+5bWnhNN4HQJ6kE8FSc9SaEvzJlud9k3OYmoVw3jh4mm1cqysCL8CbcIDsR2Ht bsINmMqgcl324vSZuz9SQbbIiuwl75DhkIyjofVw79dtaVS4ZycDWTNsFSnmyMPhpEp9 Wm9OJ5tBAA9SWW4Oqmh1epQRgEokQLljMNUd6MJWEiK2KHltvewkYg0XlpbU50qrK2I8 LkQVet0o8xYCdCUn7rGkCj6oPOfuMkiHGXE5C3or2SKVEwGMijejKIXz47Rkpdmeex9b qphw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n11si2039033ilk.101.2021.05.20.00.32.20; Thu, 20 May 2021 00:32:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230350AbhETHc5 (ORCPT + 99 others); Thu, 20 May 2021 03:32:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:49146 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbhETHc4 (ORCPT ); Thu, 20 May 2021 03:32:56 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 35D55B144; Thu, 20 May 2021 07:31:34 +0000 (UTC) From: Daniel Wagner To: linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "Martin K . Petersen" , Daniel Wagner , Hannes Reinecke Subject: [PATCH] scsi: scsi_transport_fc: Remove double FC_FPORT_DELETED in mask creation Date: Thu, 20 May 2021 09:31:27 +0200 Message-Id: <20210520073127.132456-1-dwagner@suse.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Daniel Wagner --- 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