diff options
| author | avg <avg@FreeBSD.org> | 2012-09-11 07:11:32 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2012-09-11 07:11:32 +0000 |
| commit | 1f8a1146b82a78a1b869195797eecc84d23a3a3a (patch) | |
| tree | a16be69525a5e69271e7f8aba16b85577c256bad /sys/boot/zfs | |
| parent | a7cf665d5f7e2a94346c692418677188cca0356f (diff) | |
| download | FreeBSD-src-1f8a1146b82a78a1b869195797eecc84d23a3a3a.zip FreeBSD-src-1f8a1146b82a78a1b869195797eecc84d23a3a3a.tar.gz | |
zfs boot: bring zap_leaf_chunk field names in sync with kernel code
This change is cosmetic.
MFC after: 10 days
Diffstat (limited to 'sys/boot/zfs')
| -rw-r--r-- | sys/boot/zfs/zfs.c | 2 | ||||
| -rw-r--r-- | sys/boot/zfs/zfsimpl.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/zfs/zfs.c b/sys/boot/zfs/zfs.c index baad8db..6c964b0 100644 --- a/sys/boot/zfs/zfs.c +++ b/sys/boot/zfs/zfs.c @@ -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); diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c index dd90c6c..d60418d 100644 --- a/sys/boot/zfs/zfsimpl.c +++ b/sys/boot/zfs/zfsimpl.c @@ -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; |
