diff options
| author | George Wilson <george.wilson@delphix.com> | 2012-01-23 19:08:40 -0800 |
|---|---|---|
| committer | George Wilson <george.wilson@delphix.com> | 2012-01-23 19:08:40 -0800 |
| commit | d7f601ef8b0a2967964481b924713899dcc045bb (patch) | |
| tree | 5dc64c6e5ad57467ecc2294b30e08a3448fcdd12 /usr/src/lib/libzfs/common/libzfs_dataset.c | |
| parent | 840345f69c01af33ad169d6b4a6ae7ea78b4218a (diff) | |
| download | illumos-gate-d7f601ef8b0a2967964481b924713899dcc045bb.tar.gz | |
1949 crash during reguid causes stale config
1953 allow and unallow missing from zpool history since removal of pyzfs
1955 sderr kstat should expand when a LUN is expanded
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Steve Gonczi <gonczi@comcast.net>
Approved by: Eric Schrock <eric.schrock@delphix.com>
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index 52999dfa2b..86b24bb7e1 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ #include <ctype.h> @@ -4145,7 +4145,7 @@ tryagain: (void) strlcpy(zc.zc_name, zhp->zfs_name, ZFS_MAXNAMELEN); - if (zfs_ioctl(hdl, ZFS_IOC_GET_FSACL, &zc) != 0) { + if (ioctl(hdl->libzfs_fd, ZFS_IOC_GET_FSACL, &zc) != 0) { (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, "cannot get permissions on '%s'"), zc.zc_name); |