From owner-svn-src-head@FreeBSD.ORG  Thu May 10 09:10:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8D05C1065670;
	Thu, 10 May 2012 09:10:32 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 781098FC08;
	Thu, 10 May 2012 09:10:32 +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 q4A9AWd9025899;
	Thu, 10 May 2012 09:10:32 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4A9AWLu025897;
	Thu, 10 May 2012 09:10:32 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201205100910.q4A9AWLu025897@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Thu, 10 May 2012 09:10:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235217 - head/cddl/contrib/opensolaris/cmd/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2012 09:10:32 -0000

Author: mm
Date: Thu May 10 09:10:31 2012
New Revision: 235217
URL: http://svn.freebsd.org/changeset/base/235217

Log:
  Remove unreachable break in zfs_main.c
  
  Partial import of illumos changeset 13622:e5889df1eaac
  2077 lots of unreachable breaks in illumos gate
  
  References:
  https://www.illumos.org/issues/2077
  
  PR:		kern/167370
  Submitted by:	Marcelo Araujo <araujo@FreeBSD.org>
  Obtained from:	illumos (issue #2077)
  MFC after:	1 week

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu May 10 08:57:58 2012	(r235216)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu May 10 09:10:31 2012	(r235217)
@@ -23,6 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright 2012 Milan Jurik. All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
  * All rights reserved.
  * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
@@ -765,7 +766,6 @@ zfs_do_create(int argc, char **argv)
 			(void) fprintf(stderr, gettext("missing size "
 			    "argument\n"));
 			goto badusage;
-			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);