From patchwork Fri Aug 10 18:49:10 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: 1306451 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by patchwork1.kernel.org (Postfix) with ESMTP id B6A5A3FC33 for ; Fri, 10 Aug 2012 18:52:38 +0000 (UTC) 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 q7AInKOE016365; Fri, 10 Aug 2012 14:49:22 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7AInJck011990 for ; Fri, 10 Aug 2012 14:49:19 -0400 Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.20]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7AInE59003354 for ; Fri, 10 Aug 2012 14:49:14 -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 q7AInCh4024626 for ; Fri, 10 Aug 2012 14:49:12 -0400 Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=sourceware.org; s=default; x=1345229352; h=Comment: DomainKey-Signature:Received:Date:Message-ID:From:To:Subject; bh=e0mpLlb7BMX4gEHgJHHNe3C7dQo=; b=WmpOcd53YYy2J0ZlH7MfFWNrJo6kl Bl+UuRSSYUdgEzumq7fLwd50dtnQXFkb5GJX0U4R2MM4OUGXb/7vE2DmW+dkdMg9 9YIRv4mU+kR7pnZ2HWs06/Tyx/ufPVwLr7esmCNFTUCdSboAQ0R6vSg2zSPxrqjZ n82XNOj+MmBJy4= 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=OBPeiYsXOLZY9MlNfynPb60j8wD9lMaTUHdDyR+whdrCubOh1A/a5rzTIXvKzg QKZPAju/7CfT4bICa02kh0cFQObiUH3Vz/j6W+pet99fhOj9hunAbQNczo2iWPnx CnyLJpD2XW1oyeKISekiLqkuGUeS+iSqYy7sFhWNadBbs=; Received: (qmail 6773 invoked by uid 9475); 10 Aug 2012 18:49:10 -0000 Date: 10 Aug 2012 18:49:10 -0000 Message-ID: <20120810184910.6771.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.11 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.20 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-10 18:49:10 Modified files: multipathd : main.c Log message: Fix for bz #833193. Make sure multipathd removes directories named /dev 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.43&r2=1.69.2.44 --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- multipath-tools/multipathd/main.c 2012/08/07 19:37:51 1.69.2.43 +++ multipath-tools/multipathd/main.c 2012/08/10 18:49:09 1.69.2.44 @@ -1424,10 +1424,10 @@ strcmp(mnt, "/bin") == 0 || strcmp(mnt, "/tmp") == 0 || strcmp(mnt, "/usr") == 0 || strncmp(mnt, "/usr/lib", 8) == 0 || strcmp(mnt, "/etc") == 0 || strncmp(mnt, "/proc", 5) == 0 || - strncmp(mnt, "/dev", 4) == 0 || strncmp(mnt, "/sys", 4) == 0 || + strcmp(mnt, "/dev") == 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, "/dev/", 5) == 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)