diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:04:04 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:04:04 +0000 |
| commit | 99ab767f0b40b10adde1dc9ceaf6bb39d2be5d69 (patch) | |
| tree | 2a7de5a6e401f09e065ff1efd5ac558e05536295 /usr/src/uts/common/fs/zfs/zfs_ioctl.c | |
| parent | 7660e73f5b1e781050d87237f1123324e01f467b (diff) | |
| download | illumos-joyent-99ab767f0b40b10adde1dc9ceaf6bb39d2be5d69.tar.gz | |
Revert "1948 zpool list should show more detailed pool information"
This reverts commit 4263d13f00c9691fa14620eff82abef795be0693.
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_ioctl.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_ioctl.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index 4e731d2295..929fc06296 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -22,7 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Portions Copyright 2011 Martin Matuska * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ #include <sys/types.h> @@ -4032,22 +4032,6 @@ zfs_ioc_clear(zfs_cmd_t *zc) return (error); } -static int -zfs_ioc_pool_reopen(zfs_cmd_t *zc) -{ - spa_t *spa; - int error; - - error = spa_open(zc->zc_name, &spa, FTAG); - if (error) - return (error); - - spa_vdev_state_enter(spa, SCL_NONE); - vdev_reopen(spa->spa_root_vdev); - (void) spa_vdev_state_exit(spa, NULL, 0); - spa_close(spa, FTAG); - return (0); -} /* * inputs: * zc_name name of filesystem @@ -4892,9 +4876,7 @@ static zfs_ioc_vec_t zfs_ioc_vec[] = { { zfs_ioc_destroy_snaps_nvl, zfs_secpolicy_destroy_recursive, DATASET_NAME, B_TRUE, POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY }, { zfs_ioc_pool_reguid, zfs_secpolicy_config, POOL_NAME, B_TRUE, - POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY }, - { zfs_ioc_pool_reopen, zfs_secpolicy_config, POOL_NAME, B_TRUE, - POOL_CHECK_SUSPENDED }, + POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY } }; int |