From patchwork Wed Feb 24 06:33:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 12101387 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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30CA7C433E6 for ; Wed, 24 Feb 2021 06:33:46 +0000 (UTC) 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-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75D2E64EC9 for ; Wed, 24 Feb 2021 06:33:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75D2E64EC9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614148423; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ASpNYsBTtWoZzsCpXPXi6PlKbcprjw7OQpxFjnPGoZk=; b=SSoyE41XqstGCLWtzfIssKUsF2YJDtMtxdAOB0ydN9wHxPnwrm9UDFsnazm3WgOfCvuBKj m191zdZcxAnZ9i9yxPx13pGrsqZNs27R9sZV3ki/i+S1SDJWUUHIVAUlbw+KXOLia3DN/a ryJ3ATV/kpdCWA8uS+emo7qz3Okg5po= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-44-5HxJDiR4PNm_huCxiVYx9A-1; Wed, 24 Feb 2021 01:33:41 -0500 X-MC-Unique: 5HxJDiR4PNm_huCxiVYx9A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2192C80196C; Wed, 24 Feb 2021 06:33:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B70F5D6A1; Wed, 24 Feb 2021 06:33:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D265889CC; Wed, 24 Feb 2021 06:33:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11O6XYRN029060 for ; Wed, 24 Feb 2021 01:33:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id DE15E19C47; Wed, 24 Feb 2021 06:33:34 +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 A5DA519C46; Wed, 24 Feb 2021 06:33:30 +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 11O6XTm6019893; Wed, 24 Feb 2021 00:33:29 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 11O6XSbk019892; Wed, 24 Feb 2021 00:33:28 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Wed, 24 Feb 2021 00:33:21 -0600 Message-Id: <1614148402-19847-3-git-send-email-bmarzins@redhat.com> In-Reply-To: <1614148402-19847-1-git-send-email-bmarzins@redhat.com> References: <1614148402-19847-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: dm-devel@redhat.com Cc: device-mapper development , Chongyun Wu , Martin Wilck Subject: [dm-devel] [PATCH v2 2/3] libmultipath: cleanup uid_attribute checking code X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 In get_uid(), if pp->getuid is NULL, multipath will check the pp->uid_attribute to get the wwid. If pp->uid_attribute is NULL, nothing will happen in that block of code, because both udev_available and has_uid_fallback() are false if pp->uid_attribute is NULL. So instead of multiple checks if pp->uid_attribute is NULL, just check once for the code block. Signed-off-by: Benjamin Marzinski Reviewed-by: Martin Wilck --- libmultipath/discovery.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index 3a06f319..40727fa3 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -2183,22 +2183,21 @@ get_uid (struct path * pp, int path_state, struct udev_device *udev, } else len = strlen(pp->wwid); origin = "callout"; - } else { - bool valid_uid_attr = pp->uid_attribute - && *pp->uid_attribute; - bool empty_uid_attr = pp->uid_attribute - && !*pp->uid_attribute; - bool udev_available = udev && valid_uid_attr; + } else if (pp->uid_attribute) { + /* if the uid_attribute is an empty string skip udev checking */ + bool check_uid_attr = udev && *pp->uid_attribute; - if (udev_available) { + if (check_uid_attr) { len = get_udev_uid(pp, pp->uid_attribute, udev); origin = "udev"; if (len == 0) condlog(1, "%s: empty udev uid", pp->dev); } - if ((!udev_available || (len <= 0 && allow_fallback)) + if ((!check_uid_attr || (len <= 0 && allow_fallback)) && has_uid_fallback(pp)) { - if (!udev || !empty_uid_attr) + /* if udev wasn't set or we failed in get_udev_uid() + * log at a higher priority */ + if (!udev || check_uid_attr) used_fallback = 1; len = uid_fallback(pp, path_state, &origin); }