git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding grub2 mkconfig support patch
[zfs.git]
/
lib
/
libzfs
/
libzfs_dataset.c
diff --git
a/lib/libzfs/libzfs_dataset.c
b/lib/libzfs/libzfs_dataset.c
index
3340c71
..
c51b99d
100644
(file)
--- a/
lib/libzfs/libzfs_dataset.c
+++ b/
lib/libzfs/libzfs_dataset.c
@@
-22,7
+22,7
@@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010 Nexenta Systems, Inc. All rights reserved.
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 201
1
by Delphix. All rights reserved.
+ * Copyright (c) 201
2
by Delphix. All rights reserved.
* Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
*/
* Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
*/
@@
-4377,7
+4377,7
@@
tryagain:
(void) strlcpy(zc.zc_name, zhp->zfs_name, ZFS_MAXNAMELEN);
(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);
(void) snprintf(errbuf, sizeof (errbuf),
dgettext(TEXT_DOMAIN, "cannot get permissions on '%s'"),
zc.zc_name);