MFV r289561: 6328 Fix cstyle errors in zfs codebase
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Alex Reece <alex@delphix.com> Reviewed by: Richard Elling <Richard.Elling@RichardElling.com> Reviewed by: Jorgen Lundman <lundman@lundman.net> Approved by: Robert Mustacchi <rm@joyent.com> Author: Paul Dagnelie <pcd@delphix.com> illumos/illumos-gate@9a686fbc18
This commit is contained in:
commit
6b513e2853
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=289562
@ -199,7 +199,8 @@ static boolean_t log_history = B_TRUE;
|
||||
static uint_t timestamp_fmt = NODATE;
|
||||
|
||||
static const char *
|
||||
get_usage(zpool_help_t idx) {
|
||||
get_usage(zpool_help_t idx)
|
||||
{
|
||||
switch (idx) {
|
||||
case HELP_ADD:
|
||||
return (gettext("\tadd [-fn] <pool> <vdev> ...\n"));
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
|
||||
* All rights reserved.
|
||||
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
|
||||
@ -315,7 +315,8 @@ typedef struct {
|
||||
} snapspec_arg_t;
|
||||
|
||||
static int
|
||||
snapspec_cb(zfs_handle_t *zhp, void *arg) {
|
||||
snapspec_cb(zfs_handle_t *zhp, void *arg)
|
||||
{
|
||||
snapspec_arg_t *ssa = arg;
|
||||
char *shortsnapname;
|
||||
int err = 0;
|
||||
|
@ -22,7 +22,7 @@
|
||||
/*
|
||||
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
@ -1885,7 +1885,8 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func)
|
||||
* and the like.
|
||||
*/
|
||||
static int
|
||||
ctd_check_path(char *str) {
|
||||
ctd_check_path(char *str)
|
||||
{
|
||||
/*
|
||||
* If it starts with a slash, check the last component.
|
||||
*/
|
||||
|
@ -22,7 +22,7 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2012, 2015 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
|
@ -117,7 +117,8 @@ zfeature_lookup_name(const char *name, spa_feature_t *res)
|
||||
}
|
||||
|
||||
boolean_t
|
||||
zfeature_depends_on(spa_feature_t fid, spa_feature_t check) {
|
||||
zfeature_depends_on(spa_feature_t fid, spa_feature_t check)
|
||||
{
|
||||
zfeature_info_t *feature = &spa_feature_table[fid];
|
||||
|
||||
for (int i = 0; feature->fi_depends[i] != SPA_FEATURE_NONE; i++) {
|
||||
|
@ -1944,7 +1944,8 @@ dmu_offset_next(objset_t *os, uint64_t object, boolean_t hole, uint64_t *off)
|
||||
* ID and wait for that to be synced.
|
||||
*/
|
||||
int
|
||||
dmu_object_wait_synced(objset_t *os, uint64_t object) {
|
||||
dmu_object_wait_synced(objset_t *os, uint64_t object)
|
||||
{
|
||||
dnode_t *dn;
|
||||
int error, i;
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <sys/zfs_context.h>
|
||||
|
@ -20,6 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
#ifndef _SYS_ZRLOCK_H
|
||||
@ -44,12 +45,8 @@ typedef struct zrlock {
|
||||
|
||||
extern void zrl_init(zrlock_t *);
|
||||
extern void zrl_destroy(zrlock_t *);
|
||||
#ifdef ZFS_DEBUG
|
||||
#define zrl_add(_z) zrl_add_debug((_z), __func__)
|
||||
extern void zrl_add_debug(zrlock_t *, const char *);
|
||||
#else
|
||||
extern void zrl_add(zrlock_t *);
|
||||
#endif
|
||||
#define zrl_add(_z) zrl_add_impl((_z), __func__)
|
||||
extern void zrl_add_impl(zrlock_t *, const char *);
|
||||
extern void zrl_remove(zrlock_t *);
|
||||
extern int zrl_tryenter(zrlock_t *);
|
||||
extern void zrl_exit(zrlock_t *);
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2012, 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -269,7 +269,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)
|
||||
{
|
||||
uint64_t enabled_txg_obj = spa->spa_feat_enabled_txg_obj;
|
||||
|
||||
ASSERT(zfeature_depends_on(feature->fi_feature,
|
||||
@ -493,7 +494,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));
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -20,6 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2012, 2015 by Delphix. All rights reserved.
|
||||
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||
* Copyright 2013 Saso Kiselkov. All rights reserved.
|
||||
*/
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2014, 2015 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -69,11 +69,7 @@ zrl_destroy(zrlock_t *zrl)
|
||||
}
|
||||
|
||||
void
|
||||
#ifdef ZFS_DEBUG
|
||||
zrl_add_debug(zrlock_t *zrl, const char *zc)
|
||||
#else
|
||||
zrl_add(zrlock_t *zrl)
|
||||
#endif
|
||||
zrl_add_impl(zrlock_t *zrl, const char *zc)
|
||||
{
|
||||
uint32_t n = (uint32_t)zrl->zr_refcount;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user