git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'zpool events' formatting for awk
[zfs.git]
/
module
/
zfs
/
zfs_fuid.c
diff --git
a/module/zfs/zfs_fuid.c
b/module/zfs/zfs_fuid.c
index
a853f4d
..
97fceea
100644
(file)
--- a/
module/zfs/zfs_fuid.c
+++ b/
module/zfs/zfs_fuid.c
@@
-168,12
+168,12
@@
zfs_fuid_table_destroy(avl_tree_t *idx_tree, avl_tree_t *domain_tree)
void *cookie;
cookie = NULL;
void *cookie;
cookie = NULL;
- while (
domnode = avl_destroy_nodes(domain_tree, &cookie
))
+ while (
(domnode = avl_destroy_nodes(domain_tree, &cookie)
))
ksiddomain_rele(domnode->f_ksid);
avl_destroy(domain_tree);
cookie = NULL;
ksiddomain_rele(domnode->f_ksid);
avl_destroy(domain_tree);
cookie = NULL;
- while (
domnode = avl_destroy_nodes(idx_tree, &cookie
))
+ while (
(domnode = avl_destroy_nodes(idx_tree, &cookie)
))
kmem_free(domnode, sizeof (fuid_domain_t));
avl_destroy(idx_tree);
}
kmem_free(domnode, sizeof (fuid_domain_t));
avl_destroy(idx_tree);
}
@@
-192,6
+192,7
@@
zfs_fuid_idx_domain(avl_tree_t *idx_tree, uint32_t idx)
}
#ifdef _KERNEL
}
#ifdef _KERNEL
+#ifdef HAVE_ZPL
/*
* Load the fuid table(s) into memory.
*/
/*
* Load the fuid table(s) into memory.
*/
@@
-753,4
+754,5
@@
zfs_fuid_txhold(zfsvfs_t *zfsvfs, dmu_tx_t *tx)
FUID_SIZE_ESTIMATE(zfsvfs));
}
}
FUID_SIZE_ESTIMATE(zfsvfs));
}
}
+#endif /* HAVE_ZPL */
#endif
#endif