From owner-svn-src-all@FreeBSD.ORG  Mon Jul 25 00:17:20 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D877C1065670;
	Mon, 25 Jul 2011 00:17:20 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C752C8FC12;
	Mon, 25 Jul 2011 00:17:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6P0HK8g030183;
	Mon, 25 Jul 2011 00:17:20 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6P0HKTf030181;
	Mon, 25 Jul 2011 00:17:20 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <201107250017.p6P0HKTf030181@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Mon, 25 Jul 2011 00:17:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224301 - stable/8/sys/geom/label
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2011 00:17:21 -0000

Author: sobomax
Date: Mon Jul 25 00:17:20 2011
New Revision: 224301
URL: http://svn.freebsd.org/changeset/base/224301

Log:
  MFC: Strip any leading slashes before feeding the label to the geom_label
    code. Some linux distros put mount point into the ext2fs labels, such as
    '/', or '/boot', which confuses the devfs code and can cause userland
    programs to fail reading /dev/ext2fs directory with weird error code.

Modified:
  stable/8/sys/geom/label/g_label_ext2fs.c
Directory Properties:
  stable/8/sys/geom/label/   (props changed)

Modified: stable/8/sys/geom/label/g_label_ext2fs.c
==============================================================================
--- stable/8/sys/geom/label/g_label_ext2fs.c	Sun Jul 24 23:44:16 2011	(r224300)
+++ stable/8/sys/geom/label/g_label_ext2fs.c	Mon Jul 25 00:17:20 2011	(r224301)
@@ -53,6 +53,7 @@ g_label_ext2fs_taste(struct g_consumer *
 {
 	struct g_provider *pp;
 	e2sb_t *fs;
+	char *s_volume_name;
 
 	g_topology_assert_not();
 	pp = cp->provider;
@@ -74,13 +75,18 @@ g_label_ext2fs_taste(struct g_consumer *
 		goto exit_free;
 	}
 
+	s_volume_name = fs->s_volume_name;
+	/* Terminate label */
+	s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
+
+	if (s_volume_name[0] == '/')
+		s_volume_name += 1;
+
 	/* Check for volume label */
-	if (fs->s_volume_name[0] == '\0')
+	if (s_volume_name[0] == '\0')
 		goto exit_free;
 
-	/* Terminate label */
-	fs->s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
-	strlcpy(label, fs->s_volume_name, size);
+	strlcpy(label, s_volume_name, size);
 
 exit_free:
 	g_free(fs);