From patchwork Fri Jan 17 02:18:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 11338169 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D145714B7 for ; Fri, 17 Jan 2020 02:18:55 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E26320748 for ; Fri, 17 Jan 2020 02:18:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IevAmAHu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E26320748 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579227534; 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=ncUyOmUcu+Z7ccV9TnuEAdNtEfPj1oLIijWXC3D3d9w=; b=IevAmAHu5UnNzENEE5oh9FtuOvcQiGYigTgn/lkiyw+LvhilVAY8s4eQl0yP1Vcfl00Wvs RK/kDMcJ2UWZ63q8LqN23cUQZllDv74pi34j507ZVM8O95IOlxax9b9KgokO+yJuqtxiqb B10plgxj8ufHh8RHsEAPPg1Qceoxk8w= 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-199-ET8SoynAOYi8A2cTGNikwQ-1; Thu, 16 Jan 2020 21:18:53 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 352DA18AAFA3; Fri, 17 Jan 2020 02:18:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 114315C28D; Fri, 17 Jan 2020 02:18:48 +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 C05CC18089CF; Fri, 17 Jan 2020 02:18:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00H2IXad030642 for ; Thu, 16 Jan 2020 21:18:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3EF857BA4B; Fri, 17 Jan 2020 02:18:33 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26D449A84; Fri, 17 Jan 2020 02:18:33 +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 00H2IVdG017261; Thu, 16 Jan 2020 20:18:31 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 00H2IVAe017260; Thu, 16 Jan 2020 20:18:31 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Thu, 16 Jan 2020 20:18:11 -0600 Message-Id: <1579227500-17196-7-git-send-email-bmarzins@redhat.com> In-Reply-To: <1579227500-17196-1-git-send-email-bmarzins@redhat.com> References: <1579227500-17196-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com Cc: device-mapper development , Martin Wilck Subject: [dm-devel] [PATCH 06/15] libmultipath: add missing hwe mpe variable merges 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.16 X-MC-Unique: ET8SoynAOYi8A2cTGNikwQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com There were some variables in the hwe and mpe structs that weren't being merged by merge_hwe() and merge_mpe(). Signed-off-by: Benjamin Marzinski Reviewed-by: Martin Wilck --- libmultipath/config.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libmultipath/config.c b/libmultipath/config.c index 20e3b8bf..85626e96 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -372,6 +372,10 @@ merge_hwe (struct hwentry * dst, struct hwentry * src) merge_num(san_path_err_threshold); merge_num(san_path_err_forget_rate); merge_num(san_path_err_recovery_time); + merge_num(marginal_path_err_sample_time); + merge_num(marginal_path_err_rate_threshold); + merge_num(marginal_path_err_recheck_gap_time); + merge_num(marginal_path_double_failed_time); snprintf(id, sizeof(id), "%s/%s", dst->vendor, dst->product); reconcile_features_with_options(id, &dst->features, @@ -397,6 +401,7 @@ merge_mpe(struct mpentry *dst, struct mpentry *src) if (dst->prkey_source == PRKEY_SOURCE_NONE && src->prkey_source != PRKEY_SOURCE_NONE) { dst->prkey_source = src->prkey_source; + dst->sa_flags = src->sa_flags; memcpy(&dst->reservation_key, &src->reservation_key, sizeof(dst->reservation_key)); } @@ -413,6 +418,9 @@ merge_mpe(struct mpentry *dst, struct mpentry *src) merge_num(deferred_remove); merge_num(delay_watch_checks); merge_num(delay_wait_checks); + merge_num(san_path_err_threshold); + merge_num(san_path_err_forget_rate); + merge_num(san_path_err_recovery_time); merge_num(marginal_path_err_sample_time); merge_num(marginal_path_err_rate_threshold); merge_num(marginal_path_err_recheck_gap_time);