From patchwork Mon Apr 27 21:19:41 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: 20263 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 n3RLK5tK030653 for ; Mon, 27 Apr 2009 21:20:05 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 2B9C7619B39; Mon, 27 Apr 2009 17:20:03 -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 n3RLK2Yk023863 for ; Mon, 27 Apr 2009 17:20:02 -0400 Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n3RLK17Q019207 for ; Mon, 27 Apr 2009 17:20:01 -0400 Received: from sourceware.org (sourceware.org [209.132.176.174]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id n3RLJgGt015107 for ; Mon, 27 Apr 2009 17:19:42 -0400 Received: (qmail 7842 invoked by uid 9475); 27 Apr 2009 21:19:41 -0000 Date: 27 Apr 2009 21:19:41 -0000 Message-ID: <20090427211941.7840.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -4 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.31 X-loop: dm-devel@redhat.com Cc: Subject: [dm-devel] multipath-tools/multipathd main.c 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-04-27 21:19:41 Modified files: multipathd : main.c Log message: Fix bz #496682. Multipathd not unmounting any device mounted anywhere under /etc from its private namespace. It only needs /etc itself, so it should allow any device mounted on a subdirectory to be unmounted. This is 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.19&r2=1.69.2.20 --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- multipath-tools/multipathd/main.c 2009/04/21 00:05:23 1.69.2.19 +++ multipath-tools/multipathd/main.c 2009/04/27 21:19:41 1.69.2.20 @@ -1286,9 +1286,11 @@ if (strcmp(mnt, "/") == 0 || strcmp(mnt, "/sbin") == 0 || strcmp(mnt, "/bin") == 0 || strcmp(mnt, "/tmp") == 0 || strcmp(mnt, "/usr") == 0 || strncmp(mnt, "/usr/lib", 8) == 0 || - strncmp(mnt, "/etc", 4) == 0 || strncmp(mnt, "/proc", 5) == 0 || + strcmp(mnt, "/etc") == 0 || strncmp(mnt, "/proc", 5) == 0 || strncmp(mnt, "/dev", 4) == 0 || strncmp(mnt, "/sys", 4) == 0 || - strncmp(mnt, "/var", 4) == 0 || strncmp(mnt, "/lib", 4) == 0) + strncmp(mnt, "/var", 4) == 0 || strncmp(mnt, "/lib", 4) == 0 || + strncmp(mnt, "/lib64", 6) == 0 || + strncmp(mnt, "/usr/lib64", 10) == 0) continue; if (umount2(mnt, MNT_DETACH) < 0 && errno != ENOENT) { condlog(0, "failed to umount '%s' (%s). skipping", mnt, strerror(errno));