aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2007-04-22 21:18:40 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2007-04-22 21:18:40 +0000
commit36983842594c82b031baf79fa7c22eccc9fc4501 (patch)
tree800868c879e23932ba13138798bf5e6f0201f3a6
parent77128a226d9643934bc5e01a48af4858be7dc789 (diff)
Notes
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c3
-rw-r--r--sys/contrib/opensolaris/uts/common/fs/zfs/zap.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
index fe1294ba1b74..4246ec0b0e6c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
@@ -48,6 +48,7 @@
#include <sys/refcount.h>
#include <sys/zap_impl.h>
#include <sys/zap_leaf.h>
+#include <sys/zfs_znode.h>
int fzap_default_block_shift = 14; /* 16k blocksize */
@@ -907,7 +908,7 @@ zap_value_search(objset_t *os, uint64_t zapobj, uint64_t value, char *name)
for (zap_cursor_init(&zc, os, zapobj);
(err = zap_cursor_retrieve(&zc, za)) == 0;
zap_cursor_advance(&zc)) {
- if (za->za_first_integer == value) {
+ if (ZFS_DIRENT_OBJ(za->za_first_integer) == value) {
(void) strcpy(name, za->za_name);
break;
}
diff --git a/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c b/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c
index fe1294ba1b74..4246ec0b0e6c 100644
--- a/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c
+++ b/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c
@@ -48,6 +48,7 @@
#include <sys/refcount.h>
#include <sys/zap_impl.h>
#include <sys/zap_leaf.h>
+#include <sys/zfs_znode.h>
int fzap_default_block_shift = 14; /* 16k blocksize */
@@ -907,7 +908,7 @@ zap_value_search(objset_t *os, uint64_t zapobj, uint64_t value, char *name)
for (zap_cursor_init(&zc, os, zapobj);
(err = zap_cursor_retrieve(&zc, za)) == 0;
zap_cursor_advance(&zc)) {
- if (za->za_first_integer == value) {
+ if (ZFS_DIRENT_OBJ(za->za_first_integer) == value) {
(void) strcpy(name, za->za_name);
break;
}