diff options
author | Richard Lowe <richlowe@richlowe.net> | 2011-11-08 17:01:06 -0500 |
---|---|---|
committer | Richard Lowe <richlowe@richlowe.net> | 2011-11-08 17:01:06 -0500 |
commit | 8ac09fcebf848c31516b15ce92861de4b2f514e8 (patch) | |
tree | 15f875666889194a611f93f451d6996168ed6c67 /usr/src/cmd/truss/codes.c | |
parent | 36a00406f380da1f3fd86e1a6af2de4d9f64633c (diff) | |
download | illumos-joyent-8ac09fcebf848c31516b15ce92861de4b2f514e8.tar.gz |
backout 1644/1645/1646/1647/1708: Breaks 'zfs snapshot', boot environments
Diffstat (limited to 'usr/src/cmd/truss/codes.c')
-rw-r--r-- | usr/src/cmd/truss/codes.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr/src/cmd/truss/codes.c b/usr/src/cmd/truss/codes.c index 7d9a0f0cea..119dba0aac 100644 --- a/usr/src/cmd/truss/codes.c +++ b/usr/src/cmd/truss/codes.c @@ -21,7 +21,6 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -1203,6 +1202,8 @@ const struct ioc { "zfs_cmd_t" }, { (uint_t)ZFS_IOC_PROMOTE, "ZFS_IOC_PROMOTE", "zfs_cmd_t" }, + { (uint_t)ZFS_IOC_DESTROY_SNAPS, "ZFS_IOC_DESTROY_SNAPS", + "zfs_cmd_t" }, { (uint_t)ZFS_IOC_SNAPSHOT, "ZFS_IOC_SNAPSHOT", "zfs_cmd_t" }, { (uint_t)ZFS_IOC_DSOBJ_TO_DSNAME, "ZFS_IOC_DSOBJ_TO_DSNAME", @@ -1247,10 +1248,6 @@ const struct ioc { "zfs_cmd_t" }, { (uint_t)ZFS_IOC_OBJ_TO_STATS, "ZFS_IOC_OBJ_TO_STATS", "zfs_cmd_t" }, - { (uint_t)ZFS_IOC_SPACE_WRITTEN, "ZFS_IOC_SPACE_WRITTEN", - "zfs_cmd_t" }, - { (uint_t)ZFS_IOC_DESTROY_SNAPS_NVL, "ZFS_IOC_DESTROY_SNAPS_NVL", - "zfs_cmd_t" }, /* kssl ioctls */ { (uint_t)KSSL_ADD_ENTRY, "KSSL_ADD_ENTRY", |