From patchwork Wed Oct 10 19:51:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 10635145 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 13F1913AD for ; Wed, 10 Oct 2018 19:51:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F29C2ACBB for ; Wed, 10 Oct 2018 19:51:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43D5F2ACCB; Wed, 10 Oct 2018 19:51:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C0E042AC75 for ; Wed, 10 Oct 2018 19:51:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79FF3B2CD; Wed, 10 Oct 2018 19:51:28 +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 14D8B70100; Wed, 10 Oct 2018 19:51:28 +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 6B88F4BB79; Wed, 10 Oct 2018 19:51:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w9AJpQoh013767 for ; Wed, 10 Oct 2018 15:51:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4F0C880DB8; Wed, 10 Oct 2018 19:51:26 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4453782261 for ; Wed, 10 Oct 2018 19:51:22 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2AD5881104 for ; Wed, 10 Oct 2018 19:51:21 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id 185-v6so7023640wmt.2 for ; Wed, 10 Oct 2018 12:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gI4ivGYgorPhTOBAsIxlln+7nEdaQYpuo7Ka9BgFuUw=; b=EZFvBc50jTCMV4KVLVnKRyKZpGqvhB0dGk3VdjWEoFKBQpabUuUkJt30jYem18z2gF K68tX5Md7KMsEPRpDZb39TpDkgajiKh5N43ZZe/qd7eZOsHwglZcIJQodogsAY8zkXp4 fhW3zQDHILJbQ055msM4R+A9EruWaXz+LVzWXnI2I5ZBgS5TgD4wrQkfrjHRa2pLpcE3 ouZNoER3xLkU5Y3W8qjGGBF2GIbha+LyoVDpwB3Ic7b88ZrW5Tww418OWkwWg11aaS36 LIm01aPW4F1P+o05EF+6cmrMV6LJZ/7RDBMn+eCYwTfe94ZxXSbEQjglDFXZQPIBWYOH gInQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gI4ivGYgorPhTOBAsIxlln+7nEdaQYpuo7Ka9BgFuUw=; b=Q+VY7DB4KBZtUW89M4saHa1mrpa7W/yb8E30khqDH12gWgvKxN9wa/Btsx7ZLoGsCa xDNlr1qQVgxwRRZyltgEoQObmDLmjcdUEplBa6RZhjvigQ8z2ICvkjHO/s+6Nvd1izTR lz0W8/IbD0ESqOIoN0DUke1y4VIPJKl0GVsMFfwRlAtQkGxnKr2QcBj/+GM0ndtH3ghH 3Pifk+Bj3SIeS9BmHLxEF8brxRFdtaHzz+FDQeC2ozHKoUwsV1/omE0dlptf6iTC5GQS kz6ae2DiARrHfGgyLUIwi+hPc7u9y+E6SWKs9HDhNP9a4lSSOIP3e8WEKqI7ZkhdkX+Z TYIw== X-Gm-Message-State: ABuFfoiBOQexNh0oj6x2aVn+8ll65X3gwn2Bso0e+eSH4ZQSR5wAHL4r 1adqI0DLfeBCPyJzRlBcLp/pQi4= X-Google-Smtp-Source: ACcGV607kloJttSTnRlmNmNjU/lBHKTIISj4SBmuPUSYSg7nP6fZBOXePgjG4NLd/uZ20fVajASQDw== X-Received: by 2002:a1c:6543:: with SMTP id z64-v6mr2122156wmb.57.1539201079343; Wed, 10 Oct 2018 12:51:19 -0700 (PDT) Received: from localhost (130.red-95-127-153.staticip.rima-tde.net. [95.127.153.130]) by smtp.gmail.com with ESMTPSA id f7-v6sm24259211wrr.68.2018.10.10.12.51.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Oct 2018 12:51:18 -0700 (PDT) From: Xose Vazquez Perez To: Date: Wed, 10 Oct 2018 21:51:16 +0200 Message-Id: <20181010195116.5588-1-xose.vazquez@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 10 Oct 2018 19:51:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 10 Oct 2018 19:51:21 +0000 (UTC) for IP:'209.85.128.68' DOMAIN:'mail-wm1-f68.google.com' HELO:'mail-wm1-f68.google.com' FROM:'xose.vazquez@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.128.68 mail-wm1-f68.google.com 209.85.128.68 mail-wm1-f68.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: dm-devel@redhat.com Cc: DM-DEV ML , Xose Vazquez Perez Subject: [dm-devel] [PATCH] multipath-tools: delete trailing whitespaces 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 10 Oct 2018 19:51:29 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP Cc: Christophe Varoqui Cc: DM-DEV ML Signed-off-by: Xose Vazquez Perez --- libmultipath/checkers/tur.c | 2 +- tests/dmevents.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c index 86c0cdc..5aeec6f 100644 --- a/libmultipath/checkers/tur.c +++ b/libmultipath/checkers/tur.c @@ -334,7 +334,7 @@ int libcheck_check(struct checker * c) tur_timeout(&tsp); pthread_mutex_lock(&ct->lock); if (ct->state == PATH_PENDING) - r = pthread_cond_timedwait(&ct->active, &ct->lock, + r = pthread_cond_timedwait(&ct->active, &ct->lock, &tsp); if (!r) { tur_status = ct->state; diff --git a/tests/dmevents.c b/tests/dmevents.c index 3399c81..bee117a 100644 --- a/tests/dmevents.c +++ b/tests/dmevents.c @@ -465,7 +465,7 @@ static void test_watch_dmevents_good1(void **state) skip(); remove_all_dm_device_events(); - assert_int_equal(add_dm_device_event("foo", 1, 5), 0); + assert_int_equal(add_dm_device_event("foo", 1, 5), 0); will_return(__wrap_dm_geteventnr, 0); assert_int_equal(watch_dmevents("foo"), 0); dev_evt = find_dmevents("foo");