Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 11 Sep 2012 07:11:32 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240346 - head/sys/boot/zfs
Message-ID:  <201209110711.q8B7BWYf098571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: avg
Date: Tue Sep 11 07:11:32 2012
New Revision: 240346
URL: http://svn.freebsd.org/changeset/base/240346

Log:
  zfs boot: bring zap_leaf_chunk field names in sync with kernel code
  
  This change is cosmetic.
  
  MFC after:	10 days

Modified:
  head/sys/boot/zfs/zfs.c
  head/sys/boot/zfs/zfsimpl.c

Modified: head/sys/boot/zfs/zfs.c
==============================================================================
--- head/sys/boot/zfs/zfs.c	Tue Sep 11 07:07:52 2012	(r240345)
+++ head/sys/boot/zfs/zfs.c	Tue Sep 11 07:11:32 2012	(r240346)
@@ -318,7 +318,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: head/sys/boot/zfs/zfsimpl.c
==============================================================================
--- head/sys/boot/zfs/zfsimpl.c	Tue Sep 11 07:07:52 2012	(r240345)
+++ head/sys/boot/zfs/zfsimpl.c	Tue Sep 11 07:11:32 2012	(r240346)
@@ -1245,7 +1245,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;
@@ -1458,7 +1458,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);
 
@@ -1557,7 +1557,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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209110711.q8B7BWYf098571>