From owner-svn-src-stable-10@FreeBSD.ORG  Tue Jan 20 20:44:17 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 76B86732;
 Tue, 20 Jan 2015 20:44:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 61E5F9A6;
 Tue, 20 Jan 2015 20:44:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0KKiHK5020906;
 Tue, 20 Jan 2015 20:44:17 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0KKiHjB020905;
 Tue, 20 Jan 2015 20:44:17 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201501202044.t0KKiHjB020905@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 20 Jan 2015 20:44:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r277437 - stable/10/usr.sbin/fstyp
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2015 20:44:17 -0000

Author: trasz
Date: Tue Jan 20 20:44:16 2015
New Revision: 277437
URL: https://svnweb.freebsd.org/changeset/base/277437

Log:
  MFC r277128:
  
  Fix detection of ext2/ext3 filesystems that lack labels.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/fstyp/ext2fs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/fstyp/ext2fs.c
==============================================================================
--- stable/10/usr.sbin/fstyp/ext2fs.c	Tue Jan 20 20:42:55 2015	(r277436)
+++ stable/10/usr.sbin/fstyp/ext2fs.c	Tue Jan 20 20:44:16 2015	(r277437)
@@ -78,12 +78,6 @@ fstyp_ext2fs(FILE *fp, char *label, size
 	if (s_volume_name[0] == '/')
 		s_volume_name += 1;
 
-	/* Check for volume label */
-	if (s_volume_name[0] == '\0') {
-		free(fs);
-		return (1);
-	}
-
 	strlcpy(label, s_volume_name, size);
 	free(fs);