aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/zfeature.c
diff options
context:
space:
mode:
authorGeorge Melikov <[email protected]>2017-01-12 20:42:11 +0300
committerBrian Behlendorf <[email protected]>2017-01-12 09:42:11 -0800
commite9aa730c49b91694b146e0cd28192f1aaf843d0e (patch)
tree3ee2eaf10960ad98e5f5feaee05074db0f2876d5 /module/zfs/zfeature.c
parent42b64e50c093a4ad499458a6258254e399a4de52 (diff)
OpenZFS 6328 - Fix cstyle errors in zfs codebase
Authored by: Paul Dagnelie <[email protected]> Reviewed by: Matthew Ahrens <[email protected]> Reviewed by: Alex Reece <[email protected]> Reviewed by: Richard Elling <[email protected]> Reviewed by: Jorgen Lundman <[email protected]> Approved by: Robert Mustacchi <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Ported-by: George Melikov <[email protected]> OpenZFS-issue: https://www.illumos.org/issues/6328 OpenZFS-commit: https://github.com/illumos/illumos-gate/commit/9a686fb Closes #5579
Diffstat (limited to 'module/zfs/zfeature.c')
-rw-r--r--module/zfs/zfeature.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/module/zfs/zfeature.c b/module/zfs/zfeature.c
index bda954829..d8220aa23 100644
--- a/module/zfs/zfeature.c
+++ b/module/zfs/zfeature.c
@@ -277,7 +277,8 @@ feature_get_refcount_from_disk(spa_t *spa, zfeature_info_t *feature,
static int
-feature_get_enabled_txg(spa_t *spa, zfeature_info_t *feature, uint64_t *res) {
+feature_get_enabled_txg(spa_t *spa, zfeature_info_t *feature, uint64_t *res)
+{
ASSERTV(uint64_t enabled_txg_obj = spa->spa_feat_enabled_txg_obj);
ASSERT(zfeature_depends_on(feature->fi_feature,
@@ -500,7 +501,8 @@ spa_feature_is_active(spa_t *spa, spa_feature_t fid)
* Returns B_FALSE otherwise (i.e. if the feature is not enabled).
*/
boolean_t
-spa_feature_enabled_txg(spa_t *spa, spa_feature_t fid, uint64_t *txg) {
+spa_feature_enabled_txg(spa_t *spa, spa_feature_t fid, uint64_t *txg)
+{
int err;
ASSERT(VALID_FEATURE_FID(fid));