From patchwork Tue Aug 18 21:12:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bmarzins@sourceware.org X-Patchwork-Id: 42416 X-Patchwork-Delegate: bmarzins@redhat.com Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7ILCR5U026509 for ; Tue, 18 Aug 2009 21:12:27 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 9A1CC619EDE; Tue, 18 Aug 2009 17:12:26 -0400 (EDT) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n7ILCMhw000813 for ; Tue, 18 Aug 2009 17:12:23 -0400 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7ILCLZb006765 for ; Tue, 18 Aug 2009 17:12:21 -0400 Received: from sourceware.org (sourceware.org [209.132.176.174]) by mx3.redhat.com (8.13.8/8.13.8) with SMTP id n7ILC4nh019837 for ; Tue, 18 Aug 2009 17:12:04 -0400 Received: (qmail 28564 invoked by uid 9475); 18 Aug 2009 21:12:03 -0000 Date: 18 Aug 2009 21:12:03 -0000 Message-ID: <20090818211203.28562.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -3.952 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32 X-loop: dm-devel@redhat.com Cc: Subject: [dm-devel] multipath-tools multipathd/copy.c multipathd/m ... X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: 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 CVSROOT: /cvs/dm Module name: multipath-tools Branch: RHEL5_FC6 Changes by: bmarzins@sourceware.org 2009-08-18 21:12:02 Modified files: multipathd : copy.c main.c path_priority/pp_alua: rtpg.c Log message: Change warning messages when creating the private multipathd namespace, so that they don't scare users who don't have unneeded callouts installed. Not applicable upstream. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/copy.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.5.2.1&r2=1.5.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.69.2.21&r2=1.69.2.22 http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_alua/rtpg.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.3.2.4&r2=1.3.2.5 --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- multipath-tools/multipathd/Attic/copy.c 2007/12/15 00:27:40 1.5.2.1 +++ multipath-tools/multipathd/Attic/copy.c 2009/08/18 21:12:01 1.5.2.2 @@ -24,7 +24,10 @@ fdin = open (src, O_RDONLY); if (fdin < 0) { - condlog(0, "[copy.c] cannot open %s", src); + if (errno == ENOENT) + condlog(3, "callout %s does not exist, ignoring"); + else + condlog(0, "[copy.c] cannot open %s", src); return -1; } /* --- multipath-tools/multipathd/main.c 2009/05/06 17:26:45 1.69.2.21 +++ multipath-tools/multipathd/main.c 2009/08/18 21:12:01 1.69.2.22 @@ -1338,8 +1338,11 @@ */ vector_foreach_slot (conf->binvec, bin,i) { if ((fd = open(bin, O_RDONLY)) < 0) { - condlog(0, "cannot open %s : %s\n", bin, - strerror(errno)); + if (errno == ENOENT) + condlog(3, "callout %s does not exist, ignoring"); + else + condlog(0, "cannot open %s : %s", bin, + strerror(errno)); continue; } if (fstat(fd, &statbuf) < 0) { @@ -1368,11 +1371,8 @@ * populate the ramfs with callout binaries */ vector_foreach_slot (conf->binvec, bin,i) { - if (copytodir(bin, CALLOUT_DIR) < 0) { - condlog(0, "cannot copy %s in ramfs : %s", bin, - strerror(errno)); + if (copytodir(bin, CALLOUT_DIR) < 0) continue; - } condlog(4, "cp %s in ramfs", bin); } free_strvec(conf->binvec); --- multipath-tools/path_priority/pp_alua/rtpg.c 2009/07/07 18:44:11 1.3.2.4 +++ multipath-tools/path_priority/pp_alua/rtpg.c 2009/08/18 21:12:02 1.3.2.5 @@ -269,7 +269,7 @@ rc = do_rtpg(fd, buf, buflen); if (rc < 0) goto out; - scsi_buflen = buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3] + 4; + scsi_buflen = (buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]) + 4; if (buflen < scsi_buflen) { free(buf); buf = (unsigned char *)malloc(scsi_buflen);