diff options
| author | ahl <none@none> | 2006-11-15 19:25:44 -0800 |
|---|---|---|
| committer | ahl <none@none> | 2006-11-15 19:25:44 -0800 |
| commit | f3861e1a2ceec23a5b699c24d814b7775a9e0b52 (patch) | |
| tree | 3282cf1ca75a594f2a6fd971bb8bb6dd3a35cf7e /usr/src/lib/libzfs/common/libzfs_util.c | |
| parent | 0a44ef6d9afbfe052a7e975f55ea0d2954b62a82 (diff) | |
| download | illumos-joyent-f3861e1a2ceec23a5b699c24d814b7775a9e0b52.tar.gz | |
PSARC 2006/622 iSCSI/ZFS Integration
6484731 zfs import only mounts and shares the first layer of hierarchy
6493750 zfs and iSCSI do not work togetherly correctly
6494075 destroying a pool shouldn't touch the DSL
--HG--
rename : usr/src/cmd/iscsi/common/iscsi_door.h => deleted_files/usr/src/cmd/iscsi/common/iscsi_door.h
rename : usr/src/cmd/iscsi/common/local_types.h => deleted_files/usr/src/cmd/iscsi/common/local_types.h
rename : usr/src/cmd/iscsi/common/xml.h => usr/src/lib/libiscsitgt/common/iscsitgt_impl.h
rename : usr/src/cmd/iscsi/common/xml.c => usr/src/lib/libiscsitgt/common/xml.c
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_util.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_util.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_util.c b/usr/src/lib/libzfs/common/libzfs_util.c index d000f2cacc..14be406f11 100644 --- a/usr/src/lib/libzfs/common/libzfs_util.c +++ b/usr/src/lib/libzfs/common/libzfs_util.c @@ -127,9 +127,9 @@ libzfs_error_description(libzfs_handle_t *hdl) return (dgettext(TEXT_DOMAIN, "mount failed")); case EZFS_UMOUNTFAILED: return (dgettext(TEXT_DOMAIN, "umount failed")); - case EZFS_UNSHAREFAILED: + case EZFS_UNSHARENFSFAILED: return (dgettext(TEXT_DOMAIN, "unshare(1M) failed")); - case EZFS_SHAREFAILED: + case EZFS_SHARENFSFAILED: return (dgettext(TEXT_DOMAIN, "share(1M) failed")); case EZFS_DEVLINKS: return (dgettext(TEXT_DOMAIN, "failed to create /dev links")); @@ -150,6 +150,12 @@ libzfs_error_description(libzfs_handle_t *hdl) return (dgettext(TEXT_DOMAIN, "recursive dataset dependency")); case EZFS_NOHISTORY: return (dgettext(TEXT_DOMAIN, "no history available")); + case EZFS_UNSHAREISCSIFAILED: + return (dgettext(TEXT_DOMAIN, + "iscsitgtd failed request to unshare")); + case EZFS_SHAREISCSIFAILED: + return (dgettext(TEXT_DOMAIN, + "iscsitgtd failed request to share")); case EZFS_UNKNOWN: return (dgettext(TEXT_DOMAIN, "unknown error")); default: |