d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'zpool status -v'. To get object number we should use ZFS_DIRENT_OBJ()

Browse Source 
macro, as za_first_integer field also contains type. This should be fixed in
ZFS itself, but this bug is not visible on Solaris, because there, type is
not stored in za_first_integer. On the other hand it will be visible on
MacOS X.

Reported by:	Barry Pederson <bp@barryp.org>
This commit is contained in:
Pawel Jakub Dawidek 2007-04-22 21:18:40 +00:00
parent 77128a226d
commit 3698384259
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=168959
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
View File

@ -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;
}

3
sys/contrib/opensolaris/uts/common/fs/zfs/zap.c
View File

@ -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;
}