summaryrefslogtreecommitdiffstats
path: root/cddl/contrib/opensolaris/cmd
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2014-05-24 10:41:37 +0000
committermav <mav@FreeBSD.org>2014-05-24 10:41:37 +0000
commit54ed85cbfeb8d9196eb0848fcafafa205d4a1492 (patch)
treea927aeabb9e638d8d131e7a3381f56a43d09538e /cddl/contrib/opensolaris/cmd
parent806f6922ee33344ab8914cc8da52ac114b8d8197 (diff)
downloadFreeBSD-src-54ed85cbfeb8d9196eb0848fcafafa205d4a1492.zip
FreeBSD-src-54ed85cbfeb8d9196eb0848fcafafa205d4a1492.tar.gz
MFC r265821:
Comment out some pointless device open/close around reading device IDs. FreeBSD ZFS port unlike OpenSolaris does not use device IDs, and does not implement respective devid_*() fuctions. It is pointless to open devices just to close them back immediately.
Diffstat (limited to 'cddl/contrib/opensolaris/cmd')
-rw-r--r--cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
index 5ffd39a..374798b 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
@@ -512,6 +512,7 @@ make_leaf_vdev(const char *arg, uint64_t is_log)
verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK,
(uint64_t)wholedisk) == 0);
+#ifdef have_devid
/*
* For a whole disk, defer getting its devid until after labeling it.
*/
@@ -546,6 +547,7 @@ make_leaf_vdev(const char *arg, uint64_t is_log)
(void) close(fd);
}
+#endif
return (vdev);
}
OpenPOWER on IntegriCloud