svn commit: r355773 - head/stand/libsa/zfs
Toomas Soome
tsoome at FreeBSD.org
Sun Dec 15 14:09:50 UTC 2019
Author: tsoome
Date: Sun Dec 15 14:09:49 2019
New Revision: 355773
URL: https://svnweb.freebsd.org/changeset/base/355773
Log:
loader: zfsimpl.c cstyle cleanup
No functional changes intended.
MFC after: 1 week
Modified:
head/stand/libsa/zfs/zfsimpl.c
Modified: head/stand/libsa/zfs/zfsimpl.c
==============================================================================
--- head/stand/libsa/zfs/zfsimpl.c Sun Dec 15 08:23:38 2019 (r355772)
+++ head/stand/libsa/zfs/zfsimpl.c Sun Dec 15 14:09:49 2019 (r355773)
@@ -104,7 +104,7 @@ typedef struct indirect_vsd {
*/
static vdev_list_t zfs_vdevs;
- /*
+/*
* List of ZFS features supported for read
*/
static const char *features_for_read[] = {
@@ -140,7 +140,7 @@ static char *dnode_cache_buf;
static char *zap_scratch;
static char *zfs_temp_buf, *zfs_temp_end, *zfs_temp_ptr;
-#define TEMP_SIZE (1024 * 1024)
+#define TEMP_SIZE (1024 * 1024)
static int zio_read(const spa_t *spa, const blkptr_t *bp, void *buf);
static int zfs_get_root(const spa_t *spa, uint64_t *objid);
@@ -223,13 +223,13 @@ xdr_uint64_t(const unsigned char **xdr, uint64_t *lp)
xdr_u_int(xdr, &hi);
xdr_u_int(xdr, &lo);
- *lp = (((uint64_t) hi) << 32) | lo;
+ *lp = (((uint64_t)hi) << 32) | lo;
return (0);
}
static int
nvlist_find(const unsigned char *nvlist, const char *name, int type,
- int *elementsp, void *valuep)
+ int *elementsp, void *valuep)
{
const unsigned char *p, *pair;
int junk;
@@ -247,33 +247,34 @@ nvlist_find(const unsigned char *nvlist, const char *n
const char *pairname;
xdr_int(&p, &namelen);
- pairname = (const char*) p;
+ pairname = (const char*)p;
p += roundup(namelen, 4);
xdr_int(&p, &pairtype);
- if (!memcmp(name, pairname, namelen) && type == pairtype) {
+ if (memcmp(name, pairname, namelen) == 0 && type == pairtype) {
xdr_int(&p, &elements);
if (elementsp)
*elementsp = elements;
if (type == DATA_TYPE_UINT64) {
- xdr_uint64_t(&p, (uint64_t *) valuep);
+ xdr_uint64_t(&p, (uint64_t *)valuep);
return (0);
} else if (type == DATA_TYPE_STRING) {
int len;
xdr_int(&p, &len);
- (*(const char**) valuep) = (const char*) p;
+ (*(const char**)valuep) = (const char*)p;
return (0);
- } else if (type == DATA_TYPE_NVLIST
- || type == DATA_TYPE_NVLIST_ARRAY) {
- (*(const unsigned char**) valuep) =
- (const unsigned char*) p;
+ } else if (type == DATA_TYPE_NVLIST ||
+ type == DATA_TYPE_NVLIST_ARRAY) {
+ (*(const unsigned char**)valuep) =
+ (const unsigned char*)p;
return (0);
} else {
return (EIO);
}
} else {
/*
- * Not the pair we are looking for, skip to the next one.
+ * Not the pair we are looking for, skip to the
+ * next one.
*/
p = pair + encoded_size;
}
@@ -311,12 +312,13 @@ nvlist_check_features_for_read(const unsigned char *nv
found = 0;
xdr_int(&p, &namelen);
- pairname = (const char*) p;
+ pairname = (const char*)p;
p += roundup(namelen, 4);
xdr_int(&p, &pairtype);
for (i = 0; features_for_read[i] != NULL; i++) {
- if (!memcmp(pairname, features_for_read[i], namelen)) {
+ if (memcmp(pairname, features_for_read[i],
+ namelen) == 0) {
found = 1;
break;
}
@@ -362,7 +364,7 @@ nvlist_next(const unsigned char *nvlist)
xdr_int(&p, &decoded_size);
}
- return p;
+ return (p);
}
#ifdef TEST
@@ -370,7 +372,7 @@ nvlist_next(const unsigned char *nvlist)
static const unsigned char *
nvlist_print(const unsigned char *nvlist, unsigned int indent)
{
- static const char* typenames[] = {
+ static const char *typenames[] = {
"DATA_TYPE_UNKNOWN",
"DATA_TYPE_BOOLEAN",
"DATA_TYPE_BYTE",
@@ -417,7 +419,7 @@ nvlist_print(const unsigned char *nvlist, unsigned int
const char *pairname;
xdr_int(&p, &namelen);
- pairname = (const char*) p;
+ pairname = (const char*)p;
p += roundup(namelen, 4);
xdr_int(&p, &pairtype);
@@ -453,7 +455,8 @@ nvlist_print(const unsigned char *nvlist, unsigned int
if (j != elements - 1) {
for (i = 0; i < indent; i++)
printf(" ");
- printf("%s %s", typenames[pairtype], pairname);
+ printf("%s %s", typenames[pairtype],
+ pairname);
}
}
break;
@@ -469,7 +472,7 @@ nvlist_print(const unsigned char *nvlist, unsigned int
xdr_int(&p, &decoded_size);
}
- return p;
+ return (p);
}
#endif
@@ -490,7 +493,6 @@ vdev_read_phys(vdev_t *vdev, const blkptr_t *bp, void
psize = size;
}
- /*printf("ZFS: reading %zu bytes at 0x%jx to %p\n", psize, (uintmax_t)offset, buf);*/
rc = vdev->v_phys_read(vdev, vdev->v_read_priv, offset, buf, psize);
if (rc)
return (rc);
@@ -851,7 +853,7 @@ vdev_indirect_remap(vdev_t *vd, uint64_t offset, uint6
printf("vdev_indirect_remap: out of memory.\n");
zio->io_error = ENOMEM;
}
- for ( ; rs != NULL; rs = list_remove_head(&stack)) {
+ for (; rs != NULL; rs = list_remove_head(&stack)) {
vdev_t *v = rs->rs_vd;
uint64_t num_entries = 0;
/* vdev_indirect_mapping_t *vim = v->v_mapping; */
@@ -1022,7 +1024,7 @@ vdev_disk_read(vdev_t *vdev, const blkptr_t *bp, void
{
return (vdev_read_phys(vdev, bp, buf,
- offset + VDEV_LABEL_START_SIZE, bytes));
+ offset + VDEV_LABEL_START_SIZE, bytes));
}
@@ -1121,15 +1123,16 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vde
return (ENOENT);
}
- if (strcmp(type, VDEV_TYPE_MIRROR)
- && strcmp(type, VDEV_TYPE_DISK)
+ if (strcmp(type, VDEV_TYPE_MIRROR) != 0 &&
+ strcmp(type, VDEV_TYPE_DISK) != 0 &&
#ifdef ZFS_TEST
- && strcmp(type, VDEV_TYPE_FILE)
+ strcmp(type, VDEV_TYPE_FILE) != 0 &&
#endif
- && strcmp(type, VDEV_TYPE_RAIDZ)
- && strcmp(type, VDEV_TYPE_INDIRECT)
- && strcmp(type, VDEV_TYPE_REPLACING)) {
- printf("ZFS: can only boot from disk, mirror, raidz1, raidz2 and raidz3 vdevs\n");
+ strcmp(type, VDEV_TYPE_RAIDZ) != 0 &&
+ strcmp(type, VDEV_TYPE_INDIRECT) != 0 &&
+ strcmp(type, VDEV_TYPE_REPLACING) != 0) {
+ printf("ZFS: can only boot from disk, mirror, raidz1, "
+ "raidz2 and raidz3 vdevs\n");
return (EIO);
}
@@ -1153,13 +1156,13 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vde
if (!vdev) {
is_new = 1;
- if (!strcmp(type, VDEV_TYPE_MIRROR))
+ if (strcmp(type, VDEV_TYPE_MIRROR) == 0)
vdev = vdev_create(guid, vdev_mirror_read);
- else if (!strcmp(type, VDEV_TYPE_RAIDZ))
+ else if (strcmp(type, VDEV_TYPE_RAIDZ) == 0)
vdev = vdev_create(guid, vdev_raidz_read);
- else if (!strcmp(type, VDEV_TYPE_REPLACING))
+ else if (strcmp(type, VDEV_TYPE_REPLACING) == 0)
vdev = vdev_create(guid, vdev_replacing_read);
- else if (!strcmp(type, VDEV_TYPE_INDIRECT)) {
+ else if (strcmp(type, VDEV_TYPE_INDIRECT) == 0) {
vdev_indirect_config_t *vic;
vdev = vdev_create(guid, vdev_indirect_read);
@@ -1205,7 +1208,7 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vde
} else {
char *name;
- if (!strcmp(type, "raidz")) {
+ if (strcmp(type, "raidz") == 0) {
if (vdev->v_nparity < 1 ||
vdev->v_nparity > 3) {
printf("ZFS: can only boot from disk, "
@@ -1213,12 +1216,12 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vde
"vdevs\n");
return (EIO);
}
- asprintf(&name, "%s%d-%jd", type,
+ rc = asprintf(&name, "%s%d-%jd", type,
vdev->v_nparity, id);
} else {
- asprintf(&name, "%s-%jd", type, id);
+ rc = asprintf(&name, "%s-%jd", type, id);
}
- if (name == NULL)
+ if (rc < 0)
return (ENOMEM);
vdev->v_name = name;
}
@@ -1258,7 +1261,7 @@ vdev_init_from_nvlist(const unsigned char *nvlist, vde
return (rc);
if (is_new)
STAILQ_INSERT_TAIL(&vdev->v_children, kid,
- v_childlink);
+ v_childlink);
kids = nvlist_next(kids);
}
} else {
@@ -1320,7 +1323,7 @@ spa_find_by_guid(uint64_t guid)
if (spa->spa_guid == guid)
return (spa);
- return (0);
+ return (NULL);
}
static spa_t *
@@ -1329,10 +1332,10 @@ spa_find_by_name(const char *name)
spa_t *spa;
STAILQ_FOREACH(spa, &zfs_pools, spa_link)
- if (!strcmp(spa->spa_name, name))
+ if (strcmp(spa->spa_name, name) == 0)
return (spa);
- return (0);
+ return (NULL);
}
#ifdef BOOT2
@@ -1357,7 +1360,7 @@ spa_get_primary_vdev(const spa_t *spa)
if (vdev == NULL)
return (NULL);
for (kid = STAILQ_FIRST(&vdev->v_children); kid != NULL;
- kid = STAILQ_FIRST(&vdev->v_children))
+ kid = STAILQ_FIRST(&vdev->v_children))
vdev = kid;
return (vdev);
}
@@ -1384,7 +1387,7 @@ spa_create(uint64_t guid, const char *name)
static const char *
state_name(vdev_state_t state)
{
- static const char* names[] = {
+ static const char *names[] = {
"UNKNOWN",
"CLOSED",
"OFFLINE",
@@ -1394,7 +1397,7 @@ state_name(vdev_state_t state)
"DEGRADED",
"ONLINE"
};
- return names[state];
+ return (names[state]);
}
#ifdef BOOT2
@@ -1418,7 +1421,7 @@ pager_printf(const char *fmt, ...)
#endif
-#define STATUS_FORMAT " %s %s\n"
+#define STATUS_FORMAT " %s %s\n"
static int
print_state(int indent, const char *name, vdev_state_t state)
@@ -1441,7 +1444,7 @@ vdev_status(vdev_t *vdev, int indent)
int ret;
if (vdev->v_islog) {
- (void)pager_output(" logs\n");
+ (void) pager_output(" logs\n");
indent++;
}
@@ -1736,7 +1739,7 @@ vdev_probe(vdev_phys_read_t *_read, void *read_priv, s
if (!SPA_VERSION_IS_SUPPORTED(val)) {
printf("ZFS: unsupported ZFS version %u (should be %u)\n",
- (unsigned) val, (unsigned) SPA_VERSION);
+ (unsigned)val, (unsigned)SPA_VERSION);
free(nvlist);
return (EIO);
}
@@ -1877,8 +1880,8 @@ ilog2(int n)
for (v = 0; v < 32; v++)
if (n == (1 << v))
- return v;
- return -1;
+ return (v);
+ return (-1);
}
static int
@@ -1949,8 +1952,8 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *b
zfs_free(pbuf, size);
}
if (error != 0)
- printf("ZFS: i/o error - unable to decompress block pointer data, error %d\n",
- error);
+ printf("ZFS: i/o error - unable to decompress "
+ "block pointer data, error %d\n", error);
return (error);
}
@@ -2007,7 +2010,8 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *b
}
static int
-dnode_read(const spa_t *spa, const dnode_phys_t *dnode, off_t offset, void *buf, size_t buflen)
+dnode_read(const spa_t *spa, const dnode_phys_t *dnode, off_t offset,
+ void *buf, size_t buflen)
{
int ibshift = dnode->dn_indblkshift - SPA_BLKPTRSHIFT;
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
@@ -2067,7 +2071,7 @@ dnode_read(const spa_t *spa, const dnode_phys_t *dnode
i = bsize - boff;
if (i > buflen) i = buflen;
memcpy(buf, &dnode_cache_buf[boff], i);
- buf = ((char*) buf) + i;
+ buf = ((char*)buf) + i;
offset += i;
buflen -= i;
}
@@ -2098,7 +2102,7 @@ mzap_lookup(const dnode_phys_t *dnode, const char *nam
for (i = 0; i < chunks; i++) {
mze = &mz->mz_chunk[i];
- if (!strcmp(mze->mze_name, name)) {
+ if (strcmp(mze->mze_name, name) == 0) {
*value = mze->mze_value;
return (0);
}
@@ -2112,7 +2116,8 @@ mzap_lookup(const dnode_phys_t *dnode, const char *nam
* matches.
*/
static int
-fzap_name_equal(const zap_leaf_t *zl, const zap_leaf_chunk_t *zc, const char *name)
+fzap_name_equal(const zap_leaf_t *zl, const zap_leaf_chunk_t *zc,
+ const char *name)
{
size_t namelen;
const zap_leaf_chunk_t *nc;
@@ -2124,6 +2129,7 @@ fzap_name_equal(const zap_leaf_t *zl, const zap_leaf_c
p = name;
while (namelen > 0) {
size_t len;
+
len = namelen;
if (len > ZAP_LEAF_ARRAY_BYTES)
len = ZAP_LEAF_ARRAY_BYTES;
@@ -2134,7 +2140,7 @@ fzap_name_equal(const zap_leaf_t *zl, const zap_leaf_c
nc = &ZAP_LEAF_CHUNK(zl, nc->l_array.la_next);
}
- return 1;
+ return (1);
}
/*
@@ -2153,7 +2159,7 @@ fzap_leaf_value(const zap_leaf_t *zl, const zap_leaf_c
value = (value << 8) | p[i];
}
- return value;
+ return (value);
}
static void
@@ -2225,7 +2231,7 @@ fzap_lookup(const spa_t *spa, const dnode_phys_t *dnod
uint64_t integer_size, uint64_t num_integers, void *value)
{
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
- zap_phys_t zh = *(zap_phys_t *) zap_scratch;
+ zap_phys_t zh = *(zap_phys_t *)zap_scratch;
fat_zap_t z;
uint64_t *ptrtbl;
uint64_t hash;
@@ -2235,17 +2241,17 @@ fzap_lookup(const spa_t *spa, const dnode_phys_t *dnod
return (EIO);
z.zap_block_shift = ilog2(bsize);
- z.zap_phys = (zap_phys_t *) zap_scratch;
+ z.zap_phys = (zap_phys_t *)zap_scratch;
/*
* Figure out where the pointer table is and read it in if necessary.
*/
if (zh.zap_ptrtbl.zt_blk) {
rc = dnode_read(spa, dnode, zh.zap_ptrtbl.zt_blk * bsize,
- zap_scratch, bsize);
+ zap_scratch, bsize);
if (rc)
return (rc);
- ptrtbl = (uint64_t *) zap_scratch;
+ ptrtbl = (uint64_t *)zap_scratch;
} else {
ptrtbl = &ZAP_EMBEDDED_PTRTBL_ENT(&z, 0);
}
@@ -2262,20 +2268,21 @@ fzap_lookup(const spa_t *spa, const dnode_phys_t *dnod
if (rc)
return (rc);
- zl.l_phys = (zap_leaf_phys_t *) zap_scratch;
+ zl.l_phys = (zap_leaf_phys_t *)zap_scratch;
/*
* Make sure this chunk matches our hash.
*/
- if (zl.l_phys->l_hdr.lh_prefix_len > 0
- && zl.l_phys->l_hdr.lh_prefix
- != hash >> (64 - zl.l_phys->l_hdr.lh_prefix_len))
+ if (zl.l_phys->l_hdr.lh_prefix_len > 0 &&
+ zl.l_phys->l_hdr.lh_prefix !=
+ hash >> (64 - zl.l_phys->l_hdr.lh_prefix_len))
return (ENOENT);
/*
* Hash within the chunk to find our entry.
*/
- int shift = (64 - ZAP_LEAF_HASH_SHIFT(&zl) - zl.l_phys->l_hdr.lh_prefix_len);
+ int shift = (64 - ZAP_LEAF_HASH_SHIFT(&zl) -
+ zl.l_phys->l_hdr.lh_prefix_len);
int h = (hash >> shift) & ((1 << ZAP_LEAF_HASH_SHIFT(&zl)) - 1);
h = zl.l_phys->l_hash[h];
if (h == 0xffff)
@@ -2312,12 +2319,12 @@ zap_lookup(const spa_t *spa, const dnode_phys_t *dnode
if (rc)
return (rc);
- zap_type = *(uint64_t *) zap_scratch;
+ zap_type = *(uint64_t *)zap_scratch;
if (zap_type == ZBT_MICRO)
- return mzap_lookup(dnode, name, value);
+ return (mzap_lookup(dnode, name, value));
else if (zap_type == ZBT_HEADER) {
- return fzap_lookup(spa, dnode, name, integer_size,
- num_integers, value);
+ return (fzap_lookup(spa, dnode, name, integer_size,
+ num_integers, value));
}
printf("ZFS: invalid zap_type=%d\n", (int)zap_type);
return (EIO);
@@ -2360,10 +2367,11 @@ mzap_list(const dnode_phys_t *dnode, int (*callback)(c
* the directory header.
*/
static int
-fzap_list(const spa_t *spa, const dnode_phys_t *dnode, int (*callback)(const char *, uint64_t))
+fzap_list(const spa_t *spa, const dnode_phys_t *dnode,
+ int (*callback)(const char *, uint64_t))
{
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
- zap_phys_t zh = *(zap_phys_t *) zap_scratch;
+ zap_phys_t zh = *(zap_phys_t *)zap_scratch;
fat_zap_t z;
int i, j, rc;
@@ -2371,7 +2379,7 @@ fzap_list(const spa_t *spa, const dnode_phys_t *dnode,
return (EIO);
z.zap_block_shift = ilog2(bsize);
- z.zap_phys = (zap_phys_t *) zap_scratch;
+ z.zap_phys = (zap_phys_t *)zap_scratch;
/*
* This assumes that the leaf blocks start at block 1. The
@@ -2387,7 +2395,7 @@ fzap_list(const spa_t *spa, const dnode_phys_t *dnode,
if (dnode_read(spa, dnode, off, zap_scratch, bsize))
return (EIO);
- zl.l_phys = (zap_leaf_phys_t *) zap_scratch;
+ zl.l_phys = (zap_leaf_phys_t *)zap_scratch;
for (j = 0; j < ZAP_LEAF_NUMCHUNKS(&zl); j++) {
zap_leaf_chunk_t *zc, *nc;
@@ -2422,7 +2430,7 @@ fzap_list(const spa_t *spa, const dnode_phys_t *dnode,
*/
value = fzap_leaf_value(&zl, zc);
- //printf("%s 0x%jx\n", name, (uintmax_t)value);
+ /* printf("%s 0x%jx\n", name, (uintmax_t)value); */
rc = callback((const char *)name, value);
if (rc != 0)
return (rc);
@@ -2452,15 +2460,16 @@ zap_list(const spa_t *spa, const dnode_phys_t *dnode)
if (dnode_read(spa, dnode, 0, zap_scratch, size))
return (EIO);
- zap_type = *(uint64_t *) zap_scratch;
+ zap_type = *(uint64_t *)zap_scratch;
if (zap_type == ZBT_MICRO)
- return mzap_list(dnode, zfs_printf);
+ return (mzap_list(dnode, zfs_printf));
else
- return fzap_list(spa, dnode, zfs_printf);
+ return (fzap_list(spa, dnode, zfs_printf));
}
static int
-objset_get_dnode(const spa_t *spa, const objset_phys_t *os, uint64_t objnum, dnode_phys_t *dnode)
+objset_get_dnode(const spa_t *spa, const objset_phys_t *os, uint64_t objnum,
+ dnode_phys_t *dnode)
{
off_t offset;
@@ -2470,7 +2479,8 @@ objset_get_dnode(const spa_t *spa, const objset_phys_t
}
static int
-mzap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
+mzap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name,
+ uint64_t value)
{
const mzap_phys_t *mz;
const mzap_ent_phys_t *mze;
@@ -2483,7 +2493,7 @@ mzap_rlookup(const spa_t *spa, const dnode_phys_t *dno
*/
size = dnode->dn_datablkszsec * 512;
- mz = (const mzap_phys_t *) zap_scratch;
+ mz = (const mzap_phys_t *)zap_scratch;
chunks = size / MZAP_ENT_LEN - 1;
for (i = 0; i < chunks; i++) {
@@ -2523,7 +2533,8 @@ fzap_name_copy(const zap_leaf_t *zl, const zap_leaf_ch
}
static int
-fzap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
+fzap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name,
+ uint64_t value)
{
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
zap_phys_t zh = *(zap_phys_t *) zap_scratch;
@@ -2534,7 +2545,7 @@ fzap_rlookup(const spa_t *spa, const dnode_phys_t *dno
return (EIO);
z.zap_block_shift = ilog2(bsize);
- z.zap_phys = (zap_phys_t *) zap_scratch;
+ z.zap_phys = (zap_phys_t *)zap_scratch;
/*
* This assumes that the leaf blocks start at block 1. The
@@ -2548,7 +2559,7 @@ fzap_rlookup(const spa_t *spa, const dnode_phys_t *dno
if (dnode_read(spa, dnode, off, zap_scratch, bsize))
return (EIO);
- zl.l_phys = (zap_leaf_phys_t *) zap_scratch;
+ zl.l_phys = (zap_leaf_phys_t *)zap_scratch;
for (j = 0; j < ZAP_LEAF_NUMCHUNKS(&zl); j++) {
zap_leaf_chunk_t *zc;
@@ -2571,7 +2582,8 @@ fzap_rlookup(const spa_t *spa, const dnode_phys_t *dno
}
static int
-zap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
+zap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name,
+ uint64_t value)
{
int rc;
uint64_t zap_type;
@@ -2581,11 +2593,11 @@ zap_rlookup(const spa_t *spa, const dnode_phys_t *dnod
if (rc)
return (rc);
- zap_type = *(uint64_t *) zap_scratch;
+ zap_type = *(uint64_t *)zap_scratch;
if (zap_type == ZBT_MICRO)
- return mzap_rlookup(spa, dnode, name, value);
+ return (mzap_rlookup(spa, dnode, name, value));
else
- return fzap_rlookup(spa, dnode, name, value);
+ return (fzap_rlookup(spa, dnode, name, value));
}
static int
@@ -2616,15 +2628,17 @@ zfs_rlookup(const spa_t *spa, uint64_t objnum, char *r
dd = (dsl_dir_phys_t *)&dir.dn_bonus;
/* Actual loop condition. */
- parent_obj = dd->dd_parent_obj;
+ parent_obj = dd->dd_parent_obj;
if (parent_obj == 0)
break;
- if (objset_get_dnode(spa, &spa->spa_mos, parent_obj, &parent) != 0)
+ if (objset_get_dnode(spa, &spa->spa_mos, parent_obj,
+ &parent) != 0)
return (EIO);
dd = (dsl_dir_phys_t *)&parent.dn_bonus;
child_dir_zapobj = dd->dd_child_dir_zapobj;
- if (objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj, &child_dir_zap) != 0)
+ if (objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj,
+ &child_dir_zap) != 0)
return (EIO);
if (zap_rlookup(spa, &child_dir_zap, component, dir_obj) != 0)
return (EIO);
@@ -2655,7 +2669,8 @@ zfs_lookup_dataset(const spa_t *spa, const char *name,
dsl_dir_phys_t *dd;
const char *p, *q;
- if (objset_get_dnode(spa, &spa->spa_mos, DMU_POOL_DIRECTORY_OBJECT, &dir))
+ if (objset_get_dnode(spa, &spa->spa_mos,
+ DMU_POOL_DIRECTORY_OBJECT, &dir))
return (EIO);
if (zap_lookup(spa, &dir, DMU_POOL_ROOT_DATASET, sizeof (dir_obj),
1, &dir_obj))
@@ -2684,7 +2699,8 @@ zfs_lookup_dataset(const spa_t *spa, const char *name,
}
child_dir_zapobj = dd->dd_child_dir_zapobj;
- if (objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj, &child_dir_zap) != 0)
+ if (objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj,
+ &child_dir_zap) != 0)
return (EIO);
/* Actual loop condition #2. */
@@ -2710,7 +2726,7 @@ zfs_list_dataset(const spa_t *spa, uint64_t objnum/*,
printf("ZFS: can't find dataset %ju\n", (uintmax_t)objnum);
return (EIO);
}
- ds = (dsl_dataset_phys_t *) &dataset.dn_bonus;
+ ds = (dsl_dataset_phys_t *)&dataset.dn_bonus;
dir_obj = ds->ds_dir_obj;
if (objset_get_dnode(spa, &spa->spa_mos, dir_obj, &dir)) {
@@ -2720,7 +2736,8 @@ zfs_list_dataset(const spa_t *spa, uint64_t objnum/*,
dd = (dsl_dir_phys_t *)&dir.dn_bonus;
child_dir_zapobj = dd->dd_child_dir_zapobj;
- if (objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj, &child_dir_zap) != 0) {
+ if (objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj,
+ &child_dir_zap) != 0) {
printf("ZFS: can't find child zap %ju\n", (uintmax_t)dir_obj);
return (EIO);
}
@@ -2729,7 +2746,8 @@ zfs_list_dataset(const spa_t *spa, uint64_t objnum/*,
}
int
-zfs_callback_dataset(const spa_t *spa, uint64_t objnum, int (*callback)(const char *, uint64_t))
+zfs_callback_dataset(const spa_t *spa, uint64_t objnum,
+ int (*callback)(const char *, uint64_t))
{
uint64_t dir_obj, child_dir_zapobj, zap_type;
dnode_phys_t child_dir_zap, dir, dataset;
@@ -2742,7 +2760,7 @@ zfs_callback_dataset(const spa_t *spa, uint64_t objnum
printf("ZFS: can't find dataset %ju\n", (uintmax_t)objnum);
return (err);
}
- ds = (dsl_dataset_phys_t *) &dataset.dn_bonus;
+ ds = (dsl_dataset_phys_t *)&dataset.dn_bonus;
dir_obj = ds->ds_dir_obj;
err = objset_get_dnode(spa, &spa->spa_mos, dir_obj, &dir);
@@ -2753,21 +2771,23 @@ zfs_callback_dataset(const spa_t *spa, uint64_t objnum
dd = (dsl_dir_phys_t *)&dir.dn_bonus;
child_dir_zapobj = dd->dd_child_dir_zapobj;
- err = objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj, &child_dir_zap);
+ err = objset_get_dnode(spa, &spa->spa_mos, child_dir_zapobj,
+ &child_dir_zap);
if (err != 0) {
printf("ZFS: can't find child zap %ju\n", (uintmax_t)dir_obj);
return (err);
}
- err = dnode_read(spa, &child_dir_zap, 0, zap_scratch, child_dir_zap.dn_datablkszsec * 512);
+ err = dnode_read(spa, &child_dir_zap, 0, zap_scratch,
+ child_dir_zap.dn_datablkszsec * 512);
if (err != 0)
return (err);
- zap_type = *(uint64_t *) zap_scratch;
+ zap_type = *(uint64_t *)zap_scratch;
if (zap_type == ZBT_MICRO)
- return mzap_list(&child_dir_zap, callback);
+ return (mzap_list(&child_dir_zap, callback));
else
- return fzap_list(spa, &child_dir_zap, callback);
+ return (fzap_list(spa, &child_dir_zap, callback));
}
#endif
@@ -2786,7 +2806,7 @@ zfs_mount_dataset(const spa_t *spa, uint64_t objnum, o
return (EIO);
}
- ds = (dsl_dataset_phys_t *) &dataset.dn_bonus;
+ ds = (dsl_dataset_phys_t *)&dataset.dn_bonus;
if (zio_read(spa, &ds->ds_bp, objset)) {
printf("ZFS: can't read object set for dataset %ju\n",
(uintmax_t)objnum);
@@ -2811,7 +2831,8 @@ zfs_get_root(const spa_t *spa, uint64_t *objid)
/*
* Start with the MOS directory object.
*/
- if (objset_get_dnode(spa, &spa->spa_mos, DMU_POOL_DIRECTORY_OBJECT, &dir)) {
+ if (objset_get_dnode(spa, &spa->spa_mos,
+ DMU_POOL_DIRECTORY_OBJECT, &dir)) {
printf("ZFS: can't read MOS object directory\n");
return (EIO);
}
@@ -2819,19 +2840,21 @@ zfs_get_root(const spa_t *spa, uint64_t *objid)
/*
* Lookup the pool_props and see if we can find a bootfs.
*/
- if (zap_lookup(spa, &dir, DMU_POOL_PROPS, sizeof (props), 1, &props) == 0
- && objset_get_dnode(spa, &spa->spa_mos, props, &propdir) == 0
- && zap_lookup(spa, &propdir, "bootfs", sizeof (bootfs), 1, &bootfs) == 0
- && bootfs != 0)
- {
+ if (zap_lookup(spa, &dir, DMU_POOL_PROPS,
+ sizeof(props), 1, &props) == 0 &&
+ objset_get_dnode(spa, &spa->spa_mos, props, &propdir) == 0 &&
+ zap_lookup(spa, &propdir, "bootfs",
+ sizeof(bootfs), 1, &bootfs) == 0 &&
+ bootfs != 0) {
*objid = bootfs;
return (0);
}
/*
* Lookup the root dataset directory
*/
- if (zap_lookup(spa, &dir, DMU_POOL_ROOT_DATASET, sizeof (root), 1, &root)
- || objset_get_dnode(spa, &spa->spa_mos, root, &dir)) {
+ if (zap_lookup(spa, &dir, DMU_POOL_ROOT_DATASET,
+ sizeof(root), 1, &root) ||
+ objset_get_dnode(spa, &spa->spa_mos, root, &dir)) {
printf("ZFS: can't find root dsl_dir\n");
return (EIO);
}
@@ -2840,7 +2863,7 @@ zfs_get_root(const spa_t *spa, uint64_t *objid)
* Use the information from the dataset directory's bonus buffer
* to find the dataset object and from that the object set itself.
*/
- dsl_dir_phys_t *dd = (dsl_dir_phys_t *) &dir.dn_bonus;
+ dsl_dir_phys_t *dd = (dsl_dir_phys_t *)&dir.dn_bonus;
*objid = dd->dd_head_dataset_obj;
return (0);
}
@@ -2923,7 +2946,7 @@ check_mos_features(const spa_t *spa)
if (dnode_read(spa, &dir, 0, zap_scratch, size))
return (EIO);
- zap_type = *(uint64_t *) zap_scratch;
+ zap_type = *(uint64_t *)zap_scratch;
if (zap_type == ZBT_MICRO)
rc = mzap_list(&dir, check_feature);
else
@@ -3019,8 +3042,7 @@ zfs_spa_init(spa_t *spa)
goto done;
}
- if (nvlist_find(nv, ZPOOL_CONFIG_TYPE, DATA_TYPE_STRING,
- NULL, &type)) {
+ if (nvlist_find(nv, ZPOOL_CONFIG_TYPE, DATA_TYPE_STRING, NULL, &type)) {
printf("ZFS: can't find vdev details\n");
rc = ENOENT;
goto done;
@@ -3217,7 +3239,7 @@ zfs_lookup(const struct zfsmount *mount, const char *u
return (rc);
}
- rc = zap_lookup(spa, &dn, ZFS_ROOT_OBJ, sizeof (objnum), 1, &objnum);
+ rc = zap_lookup(spa, &dn, ZFS_ROOT_OBJ, sizeof(objnum), 1, &objnum);
if (rc) {
free(entry);
return (rc);
More information about the svn-src-all
mailing list