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

zfs boot: bring zap_leaf_chunk field names in sync with kernel code

Browse Source 
This change is cosmetic.

MFC after:	10 days
This commit is contained in:
Andriy Gapon 2012-09-11 07:11:32 +00:00
parent 9c5c3cafbd
commit b6910e777e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/zfs/zfs.c
View File

@ -318,7 +318,7 @@ zfs_readdir(struct open_file *f, struct dirent *d)
if (zc->l_entry.le_type != ZAP_CHUNK_ENTRY)
goto fzap_next;
namelen = zc->l_entry.le_name_length;
namelen = zc->l_entry.le_name_numints;
if (namelen > sizeof(d->d_name))
namelen = sizeof(d->d_name);

6
sys/boot/zfs/zfsimpl.c
View File

@ -1245,7 +1245,7 @@ fzap_name_equal(const zap_leaf_t *zl, const zap_leaf_chunk_t *zc, const char *na
const zap_leaf_chunk_t *nc;
const char *p;
namelen = zc->l_entry.le_name_length;
namelen = zc->l_entry.le_name_numints;
nc = &ZAP_LEAF_CHUNK(zl, zc->l_entry.le_name_chunk);
p = name;
@ -1458,7 +1458,7 @@ fzap_list(const spa_t *spa, const dnode_phys_t *dnode)
zc = &ZAP_LEAF_CHUNK(&zl, j);
if (zc->l_entry.le_type != ZAP_CHUNK_ENTRY)
continue;
namelen = zc->l_entry.le_name_length;
namelen = zc->l_entry.le_name_numints;
if (namelen > sizeof(name))
namelen = sizeof(name);
@ -1557,7 +1557,7 @@ fzap_name_copy(const zap_leaf_t *zl, const zap_leaf_chunk_t *zc, char *name)
const zap_leaf_chunk_t *nc;
char *p;
namelen = zc->l_entry.le_name_length;
namelen = zc->l_entry.le_name_numints;
nc = &ZAP_LEAF_CHUNK(zl, zc->l_entry.le_name_chunk);
p = name;