From patchwork Tue Jul 12 22:02:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 12915743 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4DD25C43334 for ; Tue, 12 Jul 2022 22:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657663392; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ds81yRXYGWGHPQMI1clwAmJj7ca8zsUDlQoRpyVphJY=; b=Xks1XUV3GtaZl2eFmqIPZJzEsp53A8cbZNFKJpBmLZabxpdIt7g0H0ZYLoGbzAIE+Ibfi+ uq64goLw3PfMHhUw6EhqphL5sebnimoaEpvZMvepVergzOGF8c1jakWC4nVzTNoTgXyhV7 AKjpwhtTnYF6SdNSzEuF5Kem8q85Swc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-674-WCP7QpqsNQq8hWtf_7RORA-1; Tue, 12 Jul 2022 18:03:03 -0400 X-MC-Unique: WCP7QpqsNQq8hWtf_7RORA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 875C4185A7A4; Tue, 12 Jul 2022 22:03:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4ED4492C3B; Tue, 12 Jul 2022 22:02:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D978E194705F; Tue, 12 Jul 2022 22:02:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BBD31194705F for ; Tue, 12 Jul 2022 22:02:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A73AB40CF8E4; Tue, 12 Jul 2022 22:02:54 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 95E0A400DFA6; Tue, 12 Jul 2022 22:02:54 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 26CM2qk4011120; Tue, 12 Jul 2022 17:02:53 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 26CM2q1g011119; Tue, 12 Jul 2022 17:02:52 -0500 From: Benjamin Marzinski To: Christophe Varoqui Date: Tue, 12 Jul 2022 17:02:51 -0500 Message-Id: <1657663371-11080-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Subject: [dm-devel] [PATCH] libmultipath: fix find_multipaths_timeout for unknown hardware X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: device-mapper development , Martin Wilck MIME-Version: 1.0 Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com pp->hwe is now a vector that will always be allocated for all path devices. Instead of checking if it is NULL, check if it is empty. Signed-off-by: Benjamin Marzinski Reviewed-by: Martin Wilck --- libmultipath/propsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 50d0b5c8..f782f251 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -1293,7 +1293,7 @@ out: */ if (pp->find_multipaths_timeout < 0) { pp->find_multipaths_timeout = -pp->find_multipaths_timeout; - if (!pp->hwe) { + if (VECTOR_SIZE(pp->hwe) == 0) { pp->find_multipaths_timeout = DEFAULT_UNKNOWN_FIND_MULTIPATHS_TIMEOUT; origin = "(default for unknown hardware)";