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

followup on r357497: clean obsolete comment and use shift instead of multiplication

Browse Source 
Based on illumos review feedback: leftover comment, but also
have consistent block size calculation and add missing else leg to if
statement.
This commit is contained in:
Toomas Soome 2020-02-05 13:08:24 +00:00
parent eb5a41cf2f
commit 380977d557
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=357571
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stand/libsa/zfs/zfsimpl.c
View File

@ -2294,8 +2294,7 @@ dnode_read(const spa_t *spa, const dnode_phys_t *dnode, off_t offset,
}
/*
* 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 *dnode, char *name,
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);