Author: tsoome
Date: Wed Feb 5 13:08:24 2020
New Revision: 357571
URL: https://svnweb.freebsd.org/changeset/base/357571
Log:
followup on r357497: clean obsolete comment and use shift instead of
multiplication
Based on illumos review feedback: leftover comment, but also
have consistent block size calculation and add missing else leg to if
statement.
Modified:
head/stand/libsa/zfs/zfsimpl.c
Modified: head/stand/libsa/zfs/zfsimpl.c
==============================================================================
--- head/stand/libsa/zfs/zfsimpl.c Wed Feb 5 11:34:10 2020
(r357570)
+++ head/stand/libsa/zfs/zfsimpl.c Wed Feb 5 13:08:24 2020
(r357571)
@@ -2294,8 +2294,7 @@ dnode_read(const spa_t *spa, const dnode_phys_t *dnode
}
/*
- * Lookup a value in a microzap directory. Assumes that the zap
- * scratch buffer contains the directory contents.
+ * Lookup a value in a microzap directory.
*/
static int
mzap_lookup(const mzap_phys_t *mz, size_t size, const char *name,
@@ -2777,7 +2776,7 @@ static int
zap_list(const spa_t *spa, const dnode_phys_t *dnode)
{
zap_phys_t *zap;
- size_t size = dnode->dn_datablkszsec * 512;
+ size_t size = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
int rc;
zap = malloc(size);
@@ -2917,7 +2916,7 @@ zap_rlookup(const spa_t *spa, const dnode_phys_t *dnod
uint64_t value)
{
zap_phys_t *zap;
- size_t size = dnode->dn_datablkszsec * 512;
+ size_t size = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
int rc;
zap = malloc(size);
@@ -3116,7 +3115,7 @@ zfs_callback_dataset(const spa_t *spa, uint64_t objnum
return (err);
}
- size = child_dir_zap.dn_datablkszsec * 512;
+ size = child_dir_zap.dn_datablkszsec << SPA_MINBLOCKSHIFT;
zap = malloc(size);
if (zap != NULL) {
err = dnode_read(spa, &child_dir_zap, 0, zap, size);
@@ -3128,6 +3127,8 @@ zfs_callback_dataset(const spa_t *spa, uint64_t objnum
callback);
else
err = fzap_list(spa, &child_dir_zap, zap, callback);
+ } else {
+ err = ENOMEM;
}
done:
free(zap);
@@ -3286,7 +3287,7 @@ check_mos_features(const spa_t *spa)
if (dir.dn_type != DMU_OTN_ZAP_METADATA)
return (EIO);
- size = dir.dn_datablkszsec * 512;
+ size = dir.dn_datablkszsec << SPA_MINBLOCKSHIFT;
zap = malloc(size);
if (zap == NULL)
return (ENOMEM);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
