svn commit: r268714 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/zpool

[Xin LI]

Author: delphij
Date: Tue Jul 15 20:35:56 2014
New Revision: 268714
URL: http://svnweb.freebsd.org/changeset/base/268714

Log:
  4970 need controls on i/o issued by zpool import -XF
  4971 zpool import -T should accept hex values
  4972 zpool import -T implies extreme rewind, and thus a scrub
  4973 spa_load_retry retries the same txg
  4974 spa_load_verify() reads all data twice
  Reviewed by: Christopher Siden <christopher.siden at delphix.com>
  Reviewed by: Dan McDonald <danmcd at omniti.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  
  illumos/illumos-gate at e42d205944d245bf5d1c4fc45261cbe09e28a7b9

Modified:
  vendor/illumos/dist/cmd/zpool/zpool_main.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c

Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zpool/zpool_main.c	Tue Jul 15 20:32:23 2014	(r268713)
+++ vendor/illumos/dist/cmd/zpool/zpool_main.c	Tue Jul 15 20:35:56 2014	(r268714)
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
  * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
  */
@@ -1887,7 +1887,7 @@ zpool_do_import(int argc, char **argv)
 			break;
 		case 'T':
 			errno = 0;
-			txg = strtoull(optarg, &endptr, 10);
+			txg = strtoull(optarg, &endptr, 0);
 			if (errno != 0 || *endptr != '\0') {
 				(void) fprintf(stderr,
 				    gettext("invalid txg value\n"));