From patchwork Wed May 25 12:10:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Varoqui X-Patchwork-Id: 815832 Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4PCD77d004631 for ; Wed, 25 May 2011 12:13:28 GMT Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4PCAoxs009983; Wed, 25 May 2011 08:10:56 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.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 p4PCAlQY030138 for ; Wed, 25 May 2011 08:10:47 -0400 Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4PCAges029871 for ; Wed, 25 May 2011 08:10:42 -0400 Received: from mail-fx0-f46.google.com (mail-fx0-f46.google.com [209.85.161.46]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4PCAeUm014957 for ; Wed, 25 May 2011 08:10:40 -0400 Received: by fxm17 with SMTP id 17so8522376fxm.33 for ; Wed, 25 May 2011 05:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:reply-to:to:cc:in-reply-to :references:content-type:organization:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=cbj9MxPybSBIoPVuiFFXFPgh7KomwitkqHRXV70nk6c=; b=hPRp/yEPwVrcNAc2Im+hzSd8iR2cV1Lm/YUvhjqju4XxbV6VeUZR+X62KPW4UjDLyV FcQbaMQ4RbL1jbJghpqpDHk2MJY/8p4/B2LEs59+P3Erobg0ZZ85HNAXvPz+cz1KlB6D 5ojkAlh2ATiQzv2I1QjwtGAJOJ5NclidL38hY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:reply-to:to:cc:in-reply-to:references:content-type :organization:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=Gs7DnvPzp9G41aGFiHrpIXcBw6UqoGDpqLWq9URP2ZIXEdYn+ytNChhqvXkrg+n/21 /cZh8MKd7QzV9i3CMQPQo9jcbMhft/0URpjz6YrRcglmla402z1yOyCjxsNOGOf3GaCu +tOVGcYSZAznGV+0BnJxIE/Bu3urSMOrvi2gA= Received: by 10.223.75.146 with SMTP id y18mr4942489faj.61.1306325439205; Wed, 25 May 2011 05:10:39 -0700 (PDT) Received: from [192.168.0.109] (chn60-1-82-233-48-227.fbx.proxad.net [82.233.48.227]) by mx.google.com with ESMTPS id p15sm207694faa.41.2011.05.25.05.10.37 (version=SSLv3 cipher=OTHER); Wed, 25 May 2011 05:10:38 -0700 (PDT) From: Christophe Varoqui To: Hannes Reinecke In-Reply-To: <1306322079.2290.25.camel@lapoo.opensvc.com> References: <4DD3DFC0.9050300@suse.de> <1306309907.2290.14.camel@lapoo.opensvc.com> <4DDCC72A.8000601@suse.de> <1306322079.2290.25.camel@lapoo.opensvc.com> Organization: OpenSVC Date: Wed, 25 May 2011 14:10:31 +0200 Message-ID: <1306325431.2290.30.camel@lapoo.opensvc.com> Mime-Version: 1.0 X-RedHat-Spam-Score: -0.798 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RFC_ABUSE_POST) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19 X-loop: dm-devel@redhat.com Cc: device-mapper development Subject: Re: [dm-devel] SUSE multipath-tools patch resync X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: christophe.varoqui@opensvc.com, device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 25 May 2011 12:13:28 +0000 (UTC) On mer., 2011-05-25 at 13:14 +0200, Christophe Varoqui wrote: > On mer., 2011-05-25 at 11:08 +0200, Hannes Reinecke wrote: > > On 05/25/2011 09:51 AM, Christophe Varoqui wrote: > > > On mer., 2011-05-18 at 17:03 +0200, Hannes Reinecke wrote: > > >> git.kernel.org:/pub/scm/linux/kernel/git/hare/multipath-tools.git > > > > > > I started the merge. I'll post comments along the reading. It seems > > > there won't be much : this patchset is clearly a must-have. > > > > > :-) > > > > With some things so bloody obvious that I keep wondering if I'm the > > only one seeing these ... > > > The merge is done. No change wrt your branch. Still not pushed to korg. > I struggle with a hwtable corruption with no /etc/multipath.conf ... can > you reproduce that ? > Well, forget it ... it was just a matter of 'make clean && make' as some structures changed length. The merge is over and pushed to korg. I catched only to problems. You might want to review the fixes. 1/ commit e2ae02287aaec0b56ac832841130e3c855a5a471 Author: Christophe Varoqui Date: Wed May 25 14:00:52 2011 +0200 Fix segfault in dm reassign code path alias is allocated and freed in multipathd/main.c:uev_add_map(). Don't free it in ev_add_map() called from uev_add_map() to avoid double free. diff --git a/multipathd/main.c b/multipathd/main.c index 4497609..cc75921 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -272,7 +272,6 @@ ev_add_map (char * dev, char * alias, struct vectors * vecs) alias); dm_reassign(alias); } - FREE(alias); return 0; } 2/ commit 7b541d1e2cee70ad5e61edf12333e7ff49615c8c Author: Christophe Varoqui Date: Wed May 25 13:59:53 2011 +0200 Set an internal default for feature Fix segfault when no /etc/multipath.conf is present. diff --git a/libmultipath/config.c b/libmultipath/config.c index 87039f0..4236088 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -493,6 +493,7 @@ load_config (char * file) conf->bindings_file = set_default(DEFAULT_BINDINGS_FILE); conf->bindings_read_only = 0; conf->multipath_dir = set_default(DEFAULT_MULTIPATHDIR); + conf->features = set_default(DEFAULT_FEATURES); conf->flush_on_last_del = 0; conf->attribute_flags = 0; conf->reassign_maps = DEFAULT_REASSIGN_MAPS;