Author: avg
Date: Sat Sep 22 21:14:53 2012
New Revision: 240838
URL: http://svn.freebsd.org/changeset/base/240838
Log:
MFC r240346,240356: zfs boot: bring zap_leaf_chunk field names in sync
with kernel code
Modified:
stable/8/sys/boot/zfs/zfs.c
stable/8/sys/boot/zfs/zfsimpl.c
stable/8/sys/cddl/boot/zfs/zfsimpl.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/ (props changed)
Modified: stable/8/sys/boot/zfs/zfs.c
==============================================================================
--- stable/8/sys/boot/zfs/zfs.c Sat Sep 22 21:13:34 2012 (r240837)
+++ stable/8/sys/boot/zfs/zfs.c Sat Sep 22 21:14:53 2012 (r240838)
@@ -317,7 +317,7 @@ zfs_readdir(struct open_file *f, struct
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);
Modified: stable/8/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/8/sys/boot/zfs/zfsimpl.c Sat Sep 22 21:13:34 2012
(r240837)
+++ stable/8/sys/boot/zfs/zfsimpl.c Sat Sep 22 21:14:53 2012
(r240838)
@@ -1179,7 +1179,7 @@ fzap_name_equal(const zap_leaf_t *zl, co
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;
@@ -1392,7 +1392,7 @@ fzap_list(const spa_t *spa, const 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);
@@ -1491,7 +1491,7 @@ fzap_name_copy(const zap_leaf_t *zl, con
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;
Modified: stable/8/sys/cddl/boot/zfs/zfsimpl.h
==============================================================================
--- stable/8/sys/cddl/boot/zfs/zfsimpl.h Sat Sep 22 21:13:34 2012
(r240837)
+++ stable/8/sys/cddl/boot/zfs/zfsimpl.h Sat Sep 22 21:14:53 2012
(r240838)
@@ -1171,12 +1171,12 @@ typedef struct zap_leaf_phys {
typedef union zap_leaf_chunk {
struct zap_leaf_entry {
uint8_t le_type; /* always ZAP_CHUNK_ENTRY */
- uint8_t le_int_size; /* size of ints */
+ uint8_t le_value_intlen; /* size of ints */
uint16_t le_next; /* next entry in hash chain */
uint16_t le_name_chunk; /* first chunk of the name */
- uint16_t le_name_length; /* bytes in name, incl null */
+ uint16_t le_name_numints; /* bytes in name, incl null */
uint16_t le_value_chunk; /* first chunk of the value */
- uint16_t le_value_length; /* value length in ints */
+ uint16_t le_value_numints; /* value length in ints */
uint32_t le_cd; /* collision differentiator */
uint64_t le_hash; /* hash value of the name */
} l_entry;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
