diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-12 21:44:02 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-12 21:44:02 +0000 |
| commit | e2f9756b8e9461119d4c8b16701e32425283b31a (patch) | |
| tree | 589339198ca8b38dd8280d8664e06d72bca3d83a /usr/src/cmd/truss/codes.c | |
| parent | d2ea917c8c4786e6dce9d0fd7f18c55c9f72f16e (diff) | |
| parent | 8b36997aa24d9817807faa4efa301ac9c07a2b78 (diff) | |
| download | illumos-joyent-release-20131212.tar.gz | |
[illumos-gate merge]20131212release-20131212
commit 8b36997aa24d9817807faa4efa301ac9c07a2b78
4391 panic system rather than corrupting pool if we hit bug 4390
commit 78f171005391b928aaf1642b3206c534ed644332
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
commit 973c78e94bf9634782164382c9e291bf81161fa5
4121 vdev_label_init should treat request as succeeded when pool is read only
Conflicts:
usr/src/man/man1m/zfs.1m
usr/src/lib/libzfs/common/mapfile-vers
usr/src/lib/libzfs/common/libzfs_impl.h
usr/src/cmd/zfs/zfs_main.c
Diffstat (limited to 'usr/src/cmd/truss/codes.c')
| -rw-r--r-- | usr/src/cmd/truss/codes.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr/src/cmd/truss/codes.c b/usr/src/cmd/truss/codes.c index 87fae4f257..ac8a9b191f 100644 --- a/usr/src/cmd/truss/codes.c +++ b/usr/src/cmd/truss/codes.c @@ -21,7 +21,7 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. @@ -1268,6 +1268,12 @@ const struct ioc { "zfs_cmd_t" }, { (uint_t)ZFS_IOC_CLONE, "ZFS_IOC_CLONE", "zfs_cmd_t" }, + { (uint_t)ZFS_IOC_BOOKMARK, "ZFS_IOC_BOOKMARK", + "zfs_cmd_t" }, + { (uint_t)ZFS_IOC_GET_BOOKMARKS, "ZFS_IOC_GET_BOOKMARKS", + "zfs_cmd_t" }, + { (uint_t)ZFS_IOC_DESTROY_BOOKMARKS, "ZFS_IOC_DESTROY_BOOKMARKS", + "zfs_cmd_t" }, /* kssl ioctls */ { (uint_t)KSSL_ADD_ENTRY, "KSSL_ADD_ENTRY", |