From patchwork Tue Aug 7 19:37:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bmarzins@sourceware.org X-Patchwork-Id: 1287781 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by patchwork1.kernel.org (Postfix) with ESMTP id 0E7CE3FCC5 for ; Tue, 7 Aug 2012 19:41:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q77JbxDb016072; Tue, 7 Aug 2012 15:38:00 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q77JbvHU030367 for ; Tue, 7 Aug 2012 15:37:57 -0400 Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.17]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q77Jbq18032738 for ; Tue, 7 Aug 2012 15:37:52 -0400 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by mx1.redhat.com (8.14.4/8.14.4) with SMTP id q77JbqJ0025627 for ; Tue, 7 Aug 2012 15:37:52 -0400 Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=sourceware.org; s=default; x=1344973072; h=Comment: DomainKey-Signature:Received:Date:Message-ID:From:To:Subject; bh=EYZJ5etKL4SorvoRPW4OoL3oHwc=; b=kZlJqEWmBOSDXu0vyMGj+J1nhhLfQ Sd98USBxNbIjlQeLIPNck3bg866nJ4/WdQOagPnZVxAICK4mMrQCClKfbSCo1yag n4/H6dxJXi5SpqcZO1k5jStND91oE+VAEohw7g+UDYfRJe/5SnMfG1yK8m0zQdDL N9mD3D+QaqEAyw= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=sourceware.org; h=Received:Date:Message-ID:From:To:Subject; b=UNrFzIJsUm9CZNbw5yVEfh+SdeAB3vmYcva2FNZgAjSFWkPSBwEWyLWGm62v+M EHEkV/m7q8bo5UHyk5az+XhJ9HDVXkFa87mHAGDOIq5CGqYwlhn9c6Z0V3oq3iI6 o3f0u0LhbFyBWsHRlxCq3x5ni2RLgXEoxKPVgx5vDcrgw=; Received: (qmail 21272 invoked by uid 9475); 7 Aug 2012 19:37:51 -0000 Date: 7 Aug 2012 19:37:51 -0000 Message-ID: <20120807193751.21270.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -4.312 (BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_MED, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.17 X-loop: dm-devel@redhat.com Subject: [dm-devel] multipath-tools/multipathd main.c X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development 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 CVSROOT: /cvs/dm Module name: multipath-tools Branch: RHEL5_FC6 Changes by: bmarzins@sourceware.org 2012-08-07 19:37:51 Modified files: multipathd : main.c Log message: Fix for bz #843626. Make sure multipathd doesn't remove the /var/cache/multipathd directory. Not applicable upstream. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.69.2.42&r2=1.69.2.43 --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- multipath-tools/multipathd/main.c 2012/07/11 23:03:34 1.69.2.42 +++ multipath-tools/multipathd/main.c 2012/08/07 19:37:51 1.69.2.43 @@ -1427,6 +1427,7 @@ strncmp(mnt, "/dev", 4) == 0 || strncmp(mnt, "/sys", 4) == 0 || strcmp(mnt, "/var") == 0 || strcmp(mnt, "/var/lib") == 0 || strcmp(mnt, "/var/lib/multipath") == 0 || + strcmp(mnt, CALLOUT_DIR) == 0 || strncmp(mnt, "/var/run", 8) == 0 || strncmp(mnt, "/lib", 4) == 0 || strncmp(mnt, "/lib64", 6) == 0 || strncmp(mnt, "/usr/lib64", 10) == 0 || strncmp(mnt, "/ram", 4) == 0)