c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use cstyle -cpP in make cstyle check

Browse Source 
Enable picky cstyle checks and resolve the new warnings.  The vast
majority of the changes needed were to handle minor issues with
whitespace formatting.  This patch contains no functional changes.

Non-whitespace changes are as follows:

* 8 times ; to { } in for/while loop
* fix missing ; in cmd/zed/agents/zfs_diagnosis.c
* comment (confim -> confirm)
* change endline , to ; in cmd/zpool/zpool_main.c
* a number of /* BEGIN CSTYLED */ /* END CSTYLED */ blocks
* /* CSTYLED */ markers
* change == 0 to !
* ulong to unsigned long in module/zfs/dsl_scan.c
* rearrangement of module_param lines in module/zfs/metaslab.c
* add { } block around statement after for_each_online_node

Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Håkan Johansson <f96hajo@chalmers.se>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #5465
This commit is contained in:
Brian Behlendorf 2016-12-12 10:46:26 -08:00 committed by GitHub
parent d57f03e40e
commit 02730c333c
96 changed files with 501 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -43,7 +43,7 @@ checkstyle: cstyle shellcheck flake8
cstyle: cstyle:
@find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \ @find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \
! -name '*.mod.c' -type f -exec scripts/cstyle.pl {} \+ ! -name '*.mod.c' -type f -exec scripts/cstyle.pl -cpP {} \+
shellcheck: shellcheck:
@if type shellcheck > /dev/null 2>&1; then \ @if type shellcheck > /dev/null 2>&1; then \

17
cmd/raidz_test/raidz_test.c
View File

@ -53,7 +53,7 @@ static void sig_handler(int signo)
(void) sigaction(signo, &action, NULL); (void) sigaction(signo, &action, NULL);
if (rto_opts.rto_gdb) if (rto_opts.rto_gdb)
if (system(gdb)); if (system(gdb)) { }
raise(signo); raise(signo);
} }
@ -86,8 +86,7 @@ static void print_opts(raidz_test_opts_t *opts, boolean_t force)
opts->rto_dcols, /* -d */ opts->rto_dcols, /* -d */
ilog2(opts->rto_dsize), /* -s */ ilog2(opts->rto_dsize), /* -s */
opts->rto_sweep ? "yes" : "no", /* -S */ opts->rto_sweep ? "yes" : "no", /* -S */
verbose /* -v */ verbose); /* -v */
);
} }
} }
@ -115,8 +114,7 @@ static void usage(boolean_t requested)
o->rto_dcols, /* -d */ o->rto_dcols, /* -d */
ilog2(o->rto_dsize), /* -s */ ilog2(o->rto_dsize), /* -s */
rto_opts.rto_sweep ? "yes" : "no", /* -S */ rto_opts.rto_sweep ? "yes" : "no", /* -S */
o->rto_v /* -d */ o->rto_v); /* -d */
);
exit(requested ? 0 : 1); exit(requested ? 0 : 1);
} }
@ -476,16 +474,13 @@ run_rec_check_impl(raidz_test_opts_t *opts, raidz_map_t *rm, const int fn)
} }
} else { } else {
/* can reconstruct 3 failed data disk */ /* can reconstruct 3 failed data disk */
for (x0 = 0; for (x0 = 0; x0 < opts->rto_dcols; x0++) {
x0 < opts->rto_dcols; x0++) {
if (x0 >= rm->rm_cols - raidz_parity(rm)) if (x0 >= rm->rm_cols - raidz_parity(rm))
continue; continue;
for (x1 = x0 + 1; for (x1 = x0 + 1; x1 < opts->rto_dcols; x1++) {
x1 < opts->rto_dcols; x1++) {
if (x1 >= rm->rm_cols - raidz_parity(rm)) if (x1 >= rm->rm_cols - raidz_parity(rm))
continue; continue;
for (x2 = x1 + 1; for (x2 = x1 + 1; x2 < opts->rto_dcols; x2++) {
x2 < opts->rto_dcols; x2++) {
if (x2 >= if (x2 >=
rm->rm_cols - raidz_parity(rm)) rm->rm_cols - raidz_parity(rm))
continue; continue;

2
cmd/zed/agents/zfs_diagnosis.c
View File

@ -378,7 +378,7 @@ zfs_case_solve(fmd_hdl_t *hdl, zfs_case_t *zcp, const char *faultname,
boolean_t serialize; boolean_t serialize;
nvlist_t *fru = NULL; nvlist_t *fru = NULL;
#ifdef _HAS_FMD_TOPO #ifdef _HAS_FMD_TOPO
nvlist_t *fmri nvlist_t *fmri;
topo_hdl_t *thp; topo_hdl_t *thp;
int err; int err;
#endif #endif

4
cmd/zed/agents/zfs_retire.c
View File

@ -417,11 +417,11 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
/* /*
* Note: on zfsonlinux statechange events are more than just * Note: on zfsonlinux statechange events are more than just
* healthy ones so we need to confim the actual state value. * healthy ones so we need to confirm the actual state value.
*/ */
if (strcmp(class, "resource.fs.zfs.statechange") == 0 && if (strcmp(class, "resource.fs.zfs.statechange") == 0 &&
nvlist_lookup_uint64(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_STATE, nvlist_lookup_uint64(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_STATE,
&state) == 0 && state == VDEV_STATE_HEALTHY) {; &state) == 0 && state == VDEV_STATE_HEALTHY) {
zfs_vdev_repair(hdl, nvl); zfs_vdev_repair(hdl, nvl);
return; return;
} }

5
cmd/zed/zed_strings.h
View File

@ -18,15 +18,10 @@
typedef struct zed_strings zed_strings_t; typedef struct zed_strings zed_strings_t;
zed_strings_t *zed_strings_create(void); zed_strings_t *zed_strings_create(void);
void zed_strings_destroy(zed_strings_t *zsp); void zed_strings_destroy(zed_strings_t *zsp);
int zed_strings_add(zed_strings_t *zsp, const char *key, const char *s); int zed_strings_add(zed_strings_t *zsp, const char *key, const char *s);
const char *zed_strings_first(zed_strings_t *zsp); const char *zed_strings_first(zed_strings_t *zsp);
const char *zed_strings_next(zed_strings_t *zsp); const char *zed_strings_next(zed_strings_t *zsp);
int zed_strings_count(zed_strings_t *zsp); int zed_strings_count(zed_strings_t *zsp);
#endif /* !ZED_STRINGS_H */ #endif /* !ZED_STRINGS_H */

5
cmd/zpios/zpios_main.c
View File

@ -517,9 +517,8 @@ run_one(cmd_args_t *args, uint32_t id, uint32_t T, uint32_t N,
dev_clear(); dev_clear();
cmd_size = cmd_size = sizeof (zpios_cmd_t) +
sizeof (zpios_cmd_t) ((T + N + 1) * sizeof (zpios_stats_t));
+ ((T + N + 1) * sizeof (zpios_stats_t));
cmd = (zpios_cmd_t *)malloc(cmd_size); cmd = (zpios_cmd_t *)malloc(cmd_size);
if (cmd == NULL) if (cmd == NULL)
return (ENOMEM); return (ENOMEM);

2
cmd/zpool/zpool_main.c
View File

@ -4201,7 +4201,7 @@ zpool_do_iostat(int argc, char **argv)
fprintf(stderr, " -%c", flag_to_arg[idx]); fprintf(stderr, " -%c", flag_to_arg[idx]);
} }
fprintf(stderr, ". Try running a newer module.\n"), fprintf(stderr, ". Try running a newer module.\n");
pool_list_free(list); pool_list_free(list);
return (1); return (1);

5
cmd/ztest/ztest.c
View File

@ -1131,9 +1131,8 @@ ztest_dsl_prop_set_uint64(char *osname, zfs_prop_t prop, uint64_t value,
err = zfs_prop_index_to_string(prop, curval, &valname); err = zfs_prop_index_to_string(prop, curval, &valname);
if (err) if (err)
(void) printf("%s %s = %llu at '%s'\n", (void) printf("%s %s = %llu at '%s'\n", osname,
osname, propname, (unsigned long long)curval, propname, (unsigned long long)curval, setpoint);
setpoint);
else else
(void) printf("%s %s = %s at '%s'\n", (void) printf("%s %s = %s at '%s'\n",
osname, propname, valname, setpoint); osname, propname, valname, setpoint);

3
include/sys/trace_acl.h
View File

@ -42,7 +42,7 @@
* zfs_ace_hdr_t *, ..., * zfs_ace_hdr_t *, ...,
* uint32_t, ...); * uint32_t, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_ace_class, DECLARE_EVENT_CLASS(zfs_ace_class,
TP_PROTO(znode_t *zn, zfs_ace_hdr_t *ace, uint32_t mask_matched), TP_PROTO(znode_t *zn, zfs_ace_hdr_t *ace, uint32_t mask_matched),
TP_ARGS(zn, ace, mask_matched), TP_ARGS(zn, ace, mask_matched),
@ -136,6 +136,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
__entry->z_type, __entry->z_flags, __entry->z_access_mask, __entry->z_type, __entry->z_flags, __entry->z_access_mask,
__entry->mask_matched) __entry->mask_matched)
); );
/* END CSTYLED */
#define DEFINE_ACE_EVENT(name) \ #define DEFINE_ACE_EVENT(name) \
DEFINE_EVENT(zfs_ace_class, name, \ DEFINE_EVENT(zfs_ace_class, name, \

15
include/sys/trace_arc.h
View File

@ -42,7 +42,7 @@
* DTRACE_PROBE1(..., * DTRACE_PROBE1(...,
* arc_buf_hdr_t *, ...); * arc_buf_hdr_t *, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class, DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
TP_PROTO(arc_buf_hdr_t *ab), TP_PROTO(arc_buf_hdr_t *ab),
TP_ARGS(ab), TP_ARGS(ab),
@ -95,6 +95,7 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
__entry->hdr_mfu_ghost_hits, __entry->hdr_l2_hits, __entry->hdr_mfu_ghost_hits, __entry->hdr_l2_hits,
__entry->hdr_refcount) __entry->hdr_refcount)
); );
/* END CSTYLED */
#define DEFINE_ARC_BUF_HDR_EVENT(name) \ #define DEFINE_ARC_BUF_HDR_EVENT(name) \
DEFINE_EVENT(zfs_arc_buf_hdr_class, name, \ DEFINE_EVENT(zfs_arc_buf_hdr_class, name, \
@ -117,7 +118,7 @@ DEFINE_ARC_BUF_HDR_EVENT(zfs_l2arc__miss);
* vdev_t *, ..., * vdev_t *, ...,
* zio_t *, ...); * zio_t *, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_l2arc_rw_class, DECLARE_EVENT_CLASS(zfs_l2arc_rw_class,
TP_PROTO(vdev_t *vd, zio_t *zio), TP_PROTO(vdev_t *vd, zio_t *zio),
TP_ARGS(vd, zio), TP_ARGS(vd, zio),
@ -137,6 +138,7 @@ DECLARE_EVENT_CLASS(zfs_l2arc_rw_class,
ZIO_TP_PRINTK_FMT, __entry->vdev_id, __entry->vdev_guid, ZIO_TP_PRINTK_FMT, __entry->vdev_id, __entry->vdev_guid,
__entry->vdev_state, ZIO_TP_PRINTK_ARGS) __entry->vdev_state, ZIO_TP_PRINTK_ARGS)
); );
/* END CSTYLED */
#define DEFINE_L2ARC_RW_EVENT(name) \ #define DEFINE_L2ARC_RW_EVENT(name) \
DEFINE_EVENT(zfs_l2arc_rw_class, name, \ DEFINE_EVENT(zfs_l2arc_rw_class, name, \
@ -153,7 +155,7 @@ DEFINE_L2ARC_RW_EVENT(zfs_l2arc__write);
* zio_t *, ..., * zio_t *, ...,
* l2arc_write_callback_t *, ...); * l2arc_write_callback_t *, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_l2arc_iodone_class, DECLARE_EVENT_CLASS(zfs_l2arc_iodone_class,
TP_PROTO(zio_t *zio, l2arc_write_callback_t *cb), TP_PROTO(zio_t *zio, l2arc_write_callback_t *cb),
TP_ARGS(zio, cb), TP_ARGS(zio, cb),
@ -161,6 +163,7 @@ DECLARE_EVENT_CLASS(zfs_l2arc_iodone_class,
TP_fast_assign(ZIO_TP_FAST_ASSIGN), TP_fast_assign(ZIO_TP_FAST_ASSIGN),
TP_printk(ZIO_TP_PRINTK_FMT, ZIO_TP_PRINTK_ARGS) TP_printk(ZIO_TP_PRINTK_FMT, ZIO_TP_PRINTK_ARGS)
); );
/* END CSTYLED */
#define DEFINE_L2ARC_IODONE_EVENT(name) \ #define DEFINE_L2ARC_IODONE_EVENT(name) \
DEFINE_EVENT(zfs_l2arc_iodone_class, name, \ DEFINE_EVENT(zfs_l2arc_iodone_class, name, \
@ -178,7 +181,7 @@ DEFINE_L2ARC_IODONE_EVENT(zfs_l2arc__iodone);
* uint64_t, * uint64_t,
* const zbookmark_phys_t *); * const zbookmark_phys_t *);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_arc_miss_class, DECLARE_EVENT_CLASS(zfs_arc_miss_class,
TP_PROTO(arc_buf_hdr_t *hdr, TP_PROTO(arc_buf_hdr_t *hdr,
const blkptr_t *bp, uint64_t size, const zbookmark_phys_t *zb), const blkptr_t *bp, uint64_t size, const zbookmark_phys_t *zb),
@ -272,6 +275,7 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
__entry->bp_lsize, __entry->zb_objset, __entry->zb_object, __entry->bp_lsize, __entry->zb_objset, __entry->zb_object,
__entry->zb_level, __entry->zb_blkid) __entry->zb_level, __entry->zb_blkid)
); );
/* END CSTYLED */
#define DEFINE_ARC_MISS_EVENT(name) \ #define DEFINE_ARC_MISS_EVENT(name) \
DEFINE_EVENT(zfs_arc_miss_class, name, \ DEFINE_EVENT(zfs_arc_miss_class, name, \
@ -289,7 +293,7 @@ DEFINE_ARC_MISS_EVENT(zfs_arc__miss);
* uint64_t, ..., * uint64_t, ...,
* boolean_t, ...); * boolean_t, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_l2arc_evict_class, DECLARE_EVENT_CLASS(zfs_l2arc_evict_class,
TP_PROTO(l2arc_dev_t *dev, TP_PROTO(l2arc_dev_t *dev,
list_t *buflist, uint64_t taddr, boolean_t all), list_t *buflist, uint64_t taddr, boolean_t all),
@ -330,6 +334,7 @@ DECLARE_EVENT_CLASS(zfs_l2arc_evict_class,
__entry->l2ad_end, __entry->l2ad_first, __entry->l2ad_writing, __entry->l2ad_end, __entry->l2ad_first, __entry->l2ad_writing,
__entry->taddr, __entry->all) __entry->taddr, __entry->all)
); );
/* END CSTYLED */
#define DEFINE_L2ARC_EVICT_EVENT(name) \ #define DEFINE_L2ARC_EVICT_EVENT(name) \
DEFINE_EVENT(zfs_l2arc_evict_class, name, \ DEFINE_EVENT(zfs_l2arc_evict_class, name, \

6
include/sys/trace_dbgmsg.h
View File

@ -45,7 +45,7 @@
* int, ..., * int, ...,
* const char *, ...); * const char *, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_dprintf_class, DECLARE_EVENT_CLASS(zfs_dprintf_class,
TP_PROTO(const char *file, const char *function, int line, TP_PROTO(const char *file, const char *function, int line,
const char *msg), const char *msg),
@ -66,6 +66,7 @@ DECLARE_EVENT_CLASS(zfs_dprintf_class,
TP_printk("%s:%d:%s(): %s", __get_str(file), __entry->line, TP_printk("%s:%d:%s(): %s", __get_str(file), __entry->line,
__get_str(function), __get_str(msg)) __get_str(function), __get_str(msg))
); );
/* END CSTYLED */
#define DEFINE_DPRINTF_EVENT(name) \ #define DEFINE_DPRINTF_EVENT(name) \
DEFINE_EVENT(zfs_dprintf_class, name, \ DEFINE_EVENT(zfs_dprintf_class, name, \
@ -83,7 +84,7 @@ DEFINE_DPRINTF_EVENT(zfs_zfs__dprintf);
* int, ..., * int, ...,
* uintptr_t, ...); * uintptr_t, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_set_error_class, DECLARE_EVENT_CLASS(zfs_set_error_class,
TP_PROTO(const char *file, const char *function, int line, TP_PROTO(const char *file, const char *function, int line,
uintptr_t error), uintptr_t error),
@ -104,6 +105,7 @@ DECLARE_EVENT_CLASS(zfs_set_error_class,
TP_printk("%s:%d:%s(): error 0x%lx", __get_str(file), __entry->line, TP_printk("%s:%d:%s(): error 0x%lx", __get_str(file), __entry->line,
__get_str(function), __entry->error) __get_str(function), __entry->error)
); );
/* END CSTYLED */
#ifdef TP_CONDITION #ifdef TP_CONDITION
#define DEFINE_SET_ERROR_EVENT(name) \ #define DEFINE_SET_ERROR_EVENT(name) \

3
include/sys/trace_dmu.h
View File

@ -41,7 +41,7 @@
* uint64_t, ..., * uint64_t, ...,
* uint64_t, ...); * uint64_t, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_delay_mintime_class, DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
TP_PROTO(dmu_tx_t *tx, uint64_t dirty, uint64_t min_tx_time), TP_PROTO(dmu_tx_t *tx, uint64_t dirty, uint64_t min_tx_time),
TP_ARGS(tx, dirty, min_tx_time), TP_ARGS(tx, dirty, min_tx_time),
@ -102,6 +102,7 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
#endif #endif
__entry->dirty, __entry->min_tx_time) __entry->dirty, __entry->min_tx_time)
); );
/* END CSTYLED */
#define DEFINE_DELAY_MINTIME_EVENT(name) \ #define DEFINE_DELAY_MINTIME_EVENT(name) \
DEFINE_EVENT(zfs_delay_mintime_class, name, \ DEFINE_EVENT(zfs_delay_mintime_class, name, \

3
include/sys/trace_dnode.h
View File

@ -41,7 +41,7 @@
* int64_t, ..., * int64_t, ...,
* uint32_t, ...); * uint32_t, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_dnode_move_class, DECLARE_EVENT_CLASS(zfs_dnode_move_class,
TP_PROTO(dnode_t *dn, int64_t refcount, uint32_t dbufs), TP_PROTO(dnode_t *dn, int64_t refcount, uint32_t dbufs),
TP_ARGS(dn, refcount, dbufs), TP_ARGS(dn, refcount, dbufs),
@ -102,6 +102,7 @@ DECLARE_EVENT_CLASS(zfs_dnode_move_class,
__entry->dn_maxblkid, __entry->dn_tx_holds, __entry->dn_holds, __entry->dn_maxblkid, __entry->dn_tx_holds, __entry->dn_holds,
__entry->dn_have_spill, __entry->refcount, __entry->dbufs) __entry->dn_have_spill, __entry->refcount, __entry->dbufs)
); );
/* END CSTYLED */
#define DEFINE_DNODE_MOVE_EVENT(name) \ #define DEFINE_DNODE_MOVE_EVENT(name) \
DEFINE_EVENT(zfs_dnode_move_class, name, \ DEFINE_EVENT(zfs_dnode_move_class, name, \

3
include/sys/trace_multilist.h
View File

@ -41,7 +41,7 @@
* unsigned int, ..., * unsigned int, ...,
* void *, ...); * void *, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_multilist_insert_remove_class, DECLARE_EVENT_CLASS(zfs_multilist_insert_remove_class,
TP_PROTO(multilist_t *ml, unsigned sublist_idx, void *obj), TP_PROTO(multilist_t *ml, unsigned sublist_idx, void *obj),
TP_ARGS(ml, sublist_idx, obj), TP_ARGS(ml, sublist_idx, obj),
@ -60,6 +60,7 @@ DECLARE_EVENT_CLASS(zfs_multilist_insert_remove_class,
TP_printk("ml { offset %ld numsublists %llu sublistidx %u } ", TP_printk("ml { offset %ld numsublists %llu sublistidx %u } ",
__entry->ml_offset, __entry->ml_num_sublists, __entry->sublist_idx) __entry->ml_offset, __entry->ml_num_sublists, __entry->sublist_idx)
); );
/* END CSTYLED */
#define DEFINE_MULTILIST_INSERT_REMOVE_EVENT(name) \ #define DEFINE_MULTILIST_INSERT_REMOVE_EVENT(name) \
DEFINE_EVENT(zfs_multilist_insert_remove_class, name, \ DEFINE_EVENT(zfs_multilist_insert_remove_class, name, \

3
include/sys/trace_txg.h
View File

@ -40,7 +40,7 @@
* dsl_pool_t *, ..., * dsl_pool_t *, ...,
* uint64_t, ...); * uint64_t, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_txg_class, DECLARE_EVENT_CLASS(zfs_txg_class,
TP_PROTO(dsl_pool_t *dp, uint64_t txg), TP_PROTO(dsl_pool_t *dp, uint64_t txg),
TP_ARGS(dp, txg), TP_ARGS(dp, txg),
@ -52,6 +52,7 @@ DECLARE_EVENT_CLASS(zfs_txg_class,
), ),
TP_printk("txg %llu", __entry->txg) TP_printk("txg %llu", __entry->txg)
); );
/* END CSTYLED */
#define DEFINE_TXG_EVENT(name) \ #define DEFINE_TXG_EVENT(name) \
DEFINE_EVENT(zfs_txg_class, name, \ DEFINE_EVENT(zfs_txg_class, name, \

3
include/sys/trace_zil.h
View File

@ -39,7 +39,7 @@
* DTRACE_PROBE1(..., * DTRACE_PROBE1(...,
* zilog_t *, ...); * zilog_t *, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_zil_class, DECLARE_EVENT_CLASS(zfs_zil_class,
TP_PROTO(zilog_t *zilog), TP_PROTO(zilog_t *zilog),
TP_ARGS(zilog), TP_ARGS(zilog),
@ -111,6 +111,7 @@ DECLARE_EVENT_CLASS(zfs_zil_class,
__entry->zl_itx_list_sz, __entry->zl_cur_used, __entry->zl_itx_list_sz, __entry->zl_cur_used,
__entry->zl_replay_time, __entry->zl_replay_blks) __entry->zl_replay_time, __entry->zl_replay_blks)
); );
/* END CSTYLED */
#define DEFINE_ZIL_EVENT(name) \ #define DEFINE_ZIL_EVENT(name) \
DEFINE_EVENT(zfs_zil_class, name, \ DEFINE_EVENT(zfs_zil_class, name, \

2
include/sys/trace_zio.h
View File

@ -36,6 +36,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/trace_common.h> /* For ZIO macros */ #include <sys/trace_common.h> /* For ZIO macros */
/* BEGIN CSTYLED */
TRACE_EVENT(zfs_zio__delay__miss, TRACE_EVENT(zfs_zio__delay__miss,
TP_PROTO(zio_t *zio, hrtime_t now), TP_PROTO(zio_t *zio, hrtime_t now),
TP_ARGS(zio, now), TP_ARGS(zio, now),
@ -75,6 +76,7 @@ TRACE_EVENT(zfs_zio__delay__skip,
TP_fast_assign(ZIO_TP_FAST_ASSIGN), TP_fast_assign(ZIO_TP_FAST_ASSIGN),
TP_printk(ZIO_TP_PRINTK_FMT, ZIO_TP_PRINTK_ARGS) TP_printk(ZIO_TP_PRINTK_FMT, ZIO_TP_PRINTK_ARGS)
); );
/* END CSTYLED */
#endif /* _TRACE_ZIO_H */ #endif /* _TRACE_ZIO_H */

3
include/sys/trace_zrlock.h
View File

@ -40,7 +40,7 @@
* zrlock_t *, ..., * zrlock_t *, ...,
* uint32_t, ...); * uint32_t, ...);
*/ */
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_zrlock_class, DECLARE_EVENT_CLASS(zfs_zrlock_class,
TP_PROTO(zrlock_t *zrl, uint32_t n), TP_PROTO(zrlock_t *zrl, uint32_t n),
TP_ARGS(zrl, n), TP_ARGS(zrl, n),
@ -69,6 +69,7 @@ DECLARE_EVENT_CLASS(zfs_zrlock_class,
__entry->refcount, __entry->n) __entry->refcount, __entry->n)
#endif #endif
); );
/* END_CSTYLED */
#define DEFINE_ZRLOCK_EVENT(name) \ #define DEFINE_ZRLOCK_EVENT(name) \
DEFINE_EVENT(zfs_zrlock_class, name, \ DEFINE_EVENT(zfs_zrlock_class, name, \

4
include/sys/vdev_raidz.h
View File

@ -53,8 +53,8 @@ void vdev_raidz_math_init(void);
void vdev_raidz_math_fini(void); void vdev_raidz_math_fini(void);
struct raidz_impl_ops *vdev_raidz_math_get_ops(void); struct raidz_impl_ops *vdev_raidz_math_get_ops(void);
int vdev_raidz_math_generate(struct raidz_map *); int vdev_raidz_math_generate(struct raidz_map *);
int vdev_raidz_math_reconstruct(struct raidz_map *, int vdev_raidz_math_reconstruct(struct raidz_map *, const int *, const int *,
const int *, const int *, const int); const int);
int vdev_raidz_impl_set(const char *); int vdev_raidz_impl_set(const char *);
#ifdef __cplusplus #ifdef __cplusplus

3
include/sys/zpl.h
View File

@ -148,8 +148,7 @@ static inline bool
dir_emit(struct dir_context *ctx, const char *name, int namelen, dir_emit(struct dir_context *ctx, const char *name, int namelen,
uint64_t ino, unsigned type) uint64_t ino, unsigned type)
{ {
return (ctx->actor(ctx->dirent, name, namelen, ctx->pos, ino, type) return (!ctx->actor(ctx->dirent, name, namelen, ctx->pos, ino, type));
== 0);
} }
static inline bool static inline bool

3
lib/libshare/nfs.c
View File

@ -688,7 +688,8 @@ nfs_check_exportfs(void)
} }
if (pid > 0) { if (pid > 0) {
while ((rc = waitpid(pid, &status, 0)) <= 0 && errno == EINTR); while ((rc = waitpid(pid, &status, 0)) <= 0 &&
errno == EINTR) { }
if (rc <= 0) { if (rc <= 0) {
(void) close(nfs_exportfs_temp_fd); (void) close(nfs_exportfs_temp_fd);

3
lib/libspl/asm-generic/atomic.c
View File

@ -39,7 +39,7 @@ pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
/* /*
* Theses are the void returning variants * Theses are the void returning variants
*/ */
/* BEGIN CSTYLED */
#define ATOMIC_INC(name, type) \ #define ATOMIC_INC(name, type) \
void atomic_inc_##name(volatile type *target) \ void atomic_inc_##name(volatile type *target) \
{ \ { \
@ -381,6 +381,7 @@ ATOMIC_SWAP(32, uint32_t)
ATOMIC_SWAP(uint, uint_t) ATOMIC_SWAP(uint, uint_t)
ATOMIC_SWAP(ulong, ulong_t) ATOMIC_SWAP(ulong, ulong_t)
ATOMIC_SWAP(64, uint64_t) ATOMIC_SWAP(64, uint64_t)
/* END CSTYLED */
void * void *
atomic_swap_ptr(volatile void *target, void *bits) atomic_swap_ptr(volatile void *target, void *bits)

2
lib/libspl/getmntany.c
View File

@ -53,7 +53,7 @@ getmntany(FILE *fp, struct mnttab *mgetp, struct mnttab *mrefp)
while ( while (
((ret = _sol_getmntent(fp, mgetp)) == 0) && ( ((ret = _sol_getmntent(fp, mgetp)) == 0) && (
DIFF(mnt_special) || DIFF(mnt_mountp) || DIFF(mnt_special) || DIFF(mnt_mountp) ||
DIFF(mnt_fstype) || DIFF(mnt_mntopts))); DIFF(mnt_fstype) || DIFF(mnt_mntopts))) { }
return (ret); return (ret);
} }

6
lib/libzfs/libzfs_pool.c
View File

@ -3416,12 +3416,12 @@ zfs_strip_partition(char *path)
d = part + 1; d = part + 1;
} else if ((tmp[0] == 'h' || tmp[0] == 's' || tmp[0] == 'v') && } else if ((tmp[0] == 'h' || tmp[0] == 's' || tmp[0] == 'v') &&
tmp[1] == 'd') { tmp[1] == 'd') {
for (d = &tmp[2]; isalpha(*d); part = ++d); for (d = &tmp[2]; isalpha(*d); part = ++d) { }
} else if (strncmp("xvd", tmp, 3) == 0) { } else if (strncmp("xvd", tmp, 3) == 0) {
for (d = &tmp[3]; isalpha(*d); part = ++d); for (d = &tmp[3]; isalpha(*d); part = ++d) { }
} }
if (part && d && *d != '\0') { if (part && d && *d != '\0') {
for (; isdigit(*d); d++); for (; isdigit(*d); d++) { }
if (*d == '\0') if (*d == '\0')
*part = '\0'; *part = '\0';
} }

2
lib/libzfs/libzfs_util.c
View File

@ -752,7 +752,7 @@ libzfs_run_process(const char *path, char *argv[], int flags)
int status; int status;
while ((error = waitpid(pid, &status, 0)) == -1 && while ((error = waitpid(pid, &status, 0)) == -1 &&
errno == EINTR); errno == EINTR) { }
if (error < 0 || !WIFEXITED(status)) if (error < 0 || !WIFEXITED(status))
return (-1); return (-1);

1
module/icp/algs/aes/aes_impl.c
View File

@ -1596,7 +1596,6 @@ intel_aes_instructions_present(void)
if (memcmp((char *)(&ebx), "Genu", 4) == 0 && if (memcmp((char *)(&ebx), "Genu", 4) == 0 &&
memcmp((char *)(&edx), "ineI", 4) == 0 && memcmp((char *)(&edx), "ineI", 4) == 0 &&
memcmp((char *)(&ecx), "ntel", 4) == 0) { memcmp((char *)(&ecx), "ntel", 4) == 0) {
func = 1; func = 1;
subfunc = 0; subfunc = 0;

1
module/icp/algs/modes/gcm.c
View File

@ -726,7 +726,6 @@ intel_pclmulqdq_instruction_present(void)
if (memcmp((char *)(&ebx), "Genu", 4) == 0 && if (memcmp((char *)(&ebx), "Genu", 4) == 0 &&
memcmp((char *)(&edx), "ineI", 4) == 0 && memcmp((char *)(&edx), "ineI", 4) == 0 &&
memcmp((char *)(&ecx), "ntel", 4) == 0) { memcmp((char *)(&ecx), "ntel", 4) == 0) {
func = 1; func = 1;
subfunc = 0; subfunc = 0;

3
module/icp/core/kcf_prov_tabs.c
View File

@ -67,7 +67,8 @@ static uint_t prov_tab_max = KCF_MAX_PROVIDERS;
void void
kcf_prov_tab_destroy(void) kcf_prov_tab_destroy(void)
{ {
if (prov_tab) kmem_free(prov_tab, prov_tab_max * if (prov_tab)
kmem_free(prov_tab, prov_tab_max *
sizeof (kcf_provider_desc_t *)); sizeof (kcf_provider_desc_t *));
} }

9
module/icp/spi/kcf_spi.c
View File

@ -701,12 +701,9 @@ kcf_prov_kstat_update(kstat_t *ksp, int rw)
ks_data = ksp->ks_data; ks_data = ksp->ks_data;
ks_data->ps_ops_total.value.ui64 = ks_data->ps_ops_total.value.ui64 = pd->pd_sched_info.ks_ndispatches;
pd->pd_sched_info.ks_ndispatches; ks_data->ps_ops_failed.value.ui64 = pd->pd_sched_info.ks_nfails;
ks_data->ps_ops_failed.value.ui64 = ks_data->ps_ops_busy_rval.value.ui64 = pd->pd_sched_info.ks_nbusy_rval;
pd->pd_sched_info.ks_nfails;
ks_data->ps_ops_busy_rval.value.ui64 =
pd->pd_sched_info.ks_nbusy_rval;
ks_data->ps_ops_passed.value.ui64 = ks_data->ps_ops_passed.value.ui64 =
pd->pd_sched_info.ks_ndispatches - pd->pd_sched_info.ks_ndispatches -
pd->pd_sched_info.ks_nfails - pd->pd_sched_info.ks_nfails -

5
module/zfs/abd.c
View File

@ -1486,8 +1486,8 @@ abd_nr_pages_off(abd_t *abd, unsigned int size, size_t off)
else else
pos = abd->abd_u.abd_scatter.abd_offset + off; pos = abd->abd_u.abd_scatter.abd_offset + off;
return ((pos + size + PAGESIZE - 1) >> PAGE_SHIFT) return ((pos + size + PAGESIZE - 1) >> PAGE_SHIFT) -
- (pos >> PAGE_SHIFT); (pos >> PAGE_SHIFT);
} }
/* /*
@ -1537,6 +1537,7 @@ abd_scatter_bio_map_off(struct bio *bio, abd_t *abd,
module_param(zfs_abd_scatter_enabled, int, 0644); module_param(zfs_abd_scatter_enabled, int, 0644);
MODULE_PARM_DESC(zfs_abd_scatter_enabled, MODULE_PARM_DESC(zfs_abd_scatter_enabled,
"Toggle whether ABD allocations must be linear."); "Toggle whether ABD allocations must be linear.");
/* CSTYLED */
module_param(zfs_abd_scatter_max_order, uint, 0644); module_param(zfs_abd_scatter_max_order, uint, 0644);
MODULE_PARM_DESC(zfs_abd_scatter_max_order, MODULE_PARM_DESC(zfs_abd_scatter_max_order,
"Maximum order allocation used for a scatter ABD."); "Maximum order allocation used for a scatter ABD.");

3
module/zfs/arc.c
View File

@ -7688,6 +7688,7 @@ EXPORT_SYMBOL(arc_getbuf_func);
EXPORT_SYMBOL(arc_add_prune_callback); EXPORT_SYMBOL(arc_add_prune_callback);
EXPORT_SYMBOL(arc_remove_prune_callback); EXPORT_SYMBOL(arc_remove_prune_callback);
/* BEGIN CSTYLED */
module_param(zfs_arc_min, ulong, 0644); module_param(zfs_arc_min, ulong, 0644);
MODULE_PARM_DESC(zfs_arc_min, "Min arc size"); MODULE_PARM_DESC(zfs_arc_min, "Min arc size");
@ -7786,5 +7787,5 @@ MODULE_PARM_DESC(zfs_arc_dnode_limit_percent,
module_param(zfs_arc_dnode_reduce_percent, ulong, 0644); module_param(zfs_arc_dnode_reduce_percent, ulong, 0644);
MODULE_PARM_DESC(zfs_arc_dnode_reduce_percent, MODULE_PARM_DESC(zfs_arc_dnode_reduce_percent,
"Percentage of excess dnodes to try to unpin"); "Percentage of excess dnodes to try to unpin");
/* END CSTYLED */
#endif #endif

7
module/zfs/dbuf.c
View File

@ -2686,8 +2686,7 @@ __dbuf_hold_impl(struct dbuf_hold_impl_data *dh)
ASSERT3P(dh->dh_parent, ==, NULL); ASSERT3P(dh->dh_parent, ==, NULL);
dh->dh_err = dbuf_findbp(dh->dh_dn, dh->dh_level, dh->dh_blkid, dh->dh_err = dbuf_findbp(dh->dh_dn, dh->dh_level, dh->dh_blkid,
dh->dh_fail_sparse, &dh->dh_parent, dh->dh_fail_sparse, &dh->dh_parent, &dh->dh_bp, dh);
&dh->dh_bp, dh);
if (dh->dh_fail_sparse) { if (dh->dh_fail_sparse) {
if (dh->dh_err == 0 && if (dh->dh_err == 0 &&
dh->dh_bp && BP_IS_HOLE(dh->dh_bp)) dh->dh_bp && BP_IS_HOLE(dh->dh_bp))
@ -3884,7 +3883,7 @@ EXPORT_SYMBOL(dmu_buf_get_user);
EXPORT_SYMBOL(dmu_buf_freeable); EXPORT_SYMBOL(dmu_buf_freeable);
EXPORT_SYMBOL(dmu_buf_get_blkptr); EXPORT_SYMBOL(dmu_buf_get_blkptr);
/* BEGIN CSTYLED */
module_param(dbuf_cache_max_bytes, ulong, 0644); module_param(dbuf_cache_max_bytes, ulong, 0644);
MODULE_PARM_DESC(dbuf_cache_max_bytes, MODULE_PARM_DESC(dbuf_cache_max_bytes,
"Maximum size in bytes of the dbuf cache."); "Maximum size in bytes of the dbuf cache.");
@ -3902,5 +3901,5 @@ MODULE_PARM_DESC(dbuf_cache_lowater_pct,
module_param(dbuf_cache_max_shift, int, 0644); module_param(dbuf_cache_max_shift, int, 0644);
MODULE_PARM_DESC(dbuf_cache_max_shift, MODULE_PARM_DESC(dbuf_cache_max_shift,
"Cap the size of the dbuf cache to log2 fraction of arc size."); "Cap the size of the dbuf cache to log2 fraction of arc size.");
/* END CSTYLED */
#endif #endif

2
module/zfs/dmu_zfetch.c
View File

@ -336,6 +336,7 @@ dmu_zfetch(zfetch_t *zf, uint64_t blkid, uint64_t nblks, boolean_t fetch_data)
} }
#if defined(_KERNEL) && defined(HAVE_SPL) #if defined(_KERNEL) && defined(HAVE_SPL)
/* BEGIN CSTYLED */
module_param(zfs_prefetch_disable, int, 0644); module_param(zfs_prefetch_disable, int, 0644);
MODULE_PARM_DESC(zfs_prefetch_disable, "Disable all ZFS prefetching"); MODULE_PARM_DESC(zfs_prefetch_disable, "Disable all ZFS prefetching");
@ -351,4 +352,5 @@ MODULE_PARM_DESC(zfetch_max_distance,
module_param(zfetch_array_rd_sz, ulong, 0644); module_param(zfetch_array_rd_sz, ulong, 0644);
MODULE_PARM_DESC(zfetch_array_rd_sz, "Number of bytes in a array_read"); MODULE_PARM_DESC(zfetch_array_rd_sz, "Number of bytes in a array_read");
/* END CSTYLED */
#endif #endif

2
module/zfs/dsl_pool.c
View File

@ -1087,6 +1087,7 @@ dsl_pool_config_held_writer(dsl_pool_t *dp)
EXPORT_SYMBOL(dsl_pool_config_enter); EXPORT_SYMBOL(dsl_pool_config_enter);
EXPORT_SYMBOL(dsl_pool_config_exit); EXPORT_SYMBOL(dsl_pool_config_exit);
/* BEGIN CSTYLED */
/* zfs_dirty_data_max_percent only applied at module load in arc_init(). */ /* zfs_dirty_data_max_percent only applied at module load in arc_init(). */
module_param(zfs_dirty_data_max_percent, int, 0444); module_param(zfs_dirty_data_max_percent, int, 0444);
MODULE_PARM_DESC(zfs_dirty_data_max_percent, "percent of ram can be dirty"); MODULE_PARM_DESC(zfs_dirty_data_max_percent, "percent of ram can be dirty");
@ -1112,4 +1113,5 @@ MODULE_PARM_DESC(zfs_dirty_data_sync, "sync txg when this much dirty data");
module_param(zfs_delay_scale, ulong, 0644); module_param(zfs_delay_scale, ulong, 0644);
MODULE_PARM_DESC(zfs_delay_scale, "how quickly delay approaches infinity"); MODULE_PARM_DESC(zfs_delay_scale, "how quickly delay approaches infinity");
/* END CSTYLED */
#endif #endif

3
module/zfs/dsl_scan.c
View File

@ -73,7 +73,7 @@ int zfs_no_scrub_prefetch = B_FALSE; /* set to disable scrub prefetch */
enum ddt_class zfs_scrub_ddt_class_max = DDT_CLASS_DUPLICATE; enum ddt_class zfs_scrub_ddt_class_max = DDT_CLASS_DUPLICATE;
int dsl_scan_delay_completion = B_FALSE; /* set to delay scan completion */ int dsl_scan_delay_completion = B_FALSE; /* set to delay scan completion */
/* max number of blocks to free in a single TXG */ /* max number of blocks to free in a single TXG */
ulong zfs_free_max_blocks = 100000; unsigned long zfs_free_max_blocks = 100000;
#define DSL_SCAN_IS_SCRUB_RESILVER(scn) \ #define DSL_SCAN_IS_SCRUB_RESILVER(scn) \
((scn)->scn_phys.scn_func == POOL_SCAN_SCRUB || \ ((scn)->scn_phys.scn_func == POOL_SCAN_SCRUB || \
@ -1985,6 +1985,7 @@ MODULE_PARM_DESC(zfs_no_scrub_io, "Set to disable scrub I/O");
module_param(zfs_no_scrub_prefetch, int, 0644); module_param(zfs_no_scrub_prefetch, int, 0644);
MODULE_PARM_DESC(zfs_no_scrub_prefetch, "Set to disable scrub prefetching"); MODULE_PARM_DESC(zfs_no_scrub_prefetch, "Set to disable scrub prefetching");
/* CSTYLED */
module_param(zfs_free_max_blocks, ulong, 0644); module_param(zfs_free_max_blocks, ulong, 0644);
MODULE_PARM_DESC(zfs_free_max_blocks, "Max number of blocks freed in one txg"); MODULE_PARM_DESC(zfs_free_max_blocks, "Max number of blocks freed in one txg");

27
module/zfs/metaslab.c
View File

@ -2924,37 +2924,44 @@ metaslab_check_free(spa_t *spa, const blkptr_t *bp)
} }
#if defined(_KERNEL) && defined(HAVE_SPL) #if defined(_KERNEL) && defined(HAVE_SPL)
/* CSTYLED */
module_param(metaslab_aliquot, ulong, 0644); module_param(metaslab_aliquot, ulong, 0644);
module_param(metaslab_debug_load, int, 0644);
module_param(metaslab_debug_unload, int, 0644);
module_param(metaslab_preload_enabled, int, 0644);
module_param(zfs_mg_noalloc_threshold, int, 0644);
module_param(zfs_mg_fragmentation_threshold, int, 0644);
module_param(zfs_metaslab_fragmentation_threshold, int, 0644);
module_param(metaslab_fragmentation_factor_enabled, int, 0644);
module_param(metaslab_lba_weighting_enabled, int, 0644);
module_param(metaslab_bias_enabled, int, 0644);
MODULE_PARM_DESC(metaslab_aliquot, MODULE_PARM_DESC(metaslab_aliquot,
"allocation granularity (a.k.a. stripe size)"); "allocation granularity (a.k.a. stripe size)");
module_param(metaslab_debug_load, int, 0644);
MODULE_PARM_DESC(metaslab_debug_load, MODULE_PARM_DESC(metaslab_debug_load,
"load all metaslabs when pool is first opened"); "load all metaslabs when pool is first opened");
module_param(metaslab_debug_unload, int, 0644);
MODULE_PARM_DESC(metaslab_debug_unload, MODULE_PARM_DESC(metaslab_debug_unload,
"prevent metaslabs from being unloaded"); "prevent metaslabs from being unloaded");
module_param(metaslab_preload_enabled, int, 0644);
MODULE_PARM_DESC(metaslab_preload_enabled, MODULE_PARM_DESC(metaslab_preload_enabled,
"preload potential metaslabs during reassessment"); "preload potential metaslabs during reassessment");
module_param(zfs_mg_noalloc_threshold, int, 0644);
MODULE_PARM_DESC(zfs_mg_noalloc_threshold, MODULE_PARM_DESC(zfs_mg_noalloc_threshold,
"percentage of free space for metaslab group to allow allocation"); "percentage of free space for metaslab group to allow allocation");
module_param(zfs_mg_fragmentation_threshold, int, 0644);
MODULE_PARM_DESC(zfs_mg_fragmentation_threshold, MODULE_PARM_DESC(zfs_mg_fragmentation_threshold,
"fragmentation for metaslab group to allow allocation"); "fragmentation for metaslab group to allow allocation");
module_param(zfs_metaslab_fragmentation_threshold, int, 0644);
MODULE_PARM_DESC(zfs_metaslab_fragmentation_threshold, MODULE_PARM_DESC(zfs_metaslab_fragmentation_threshold,
"fragmentation for metaslab to allow allocation"); "fragmentation for metaslab to allow allocation");
module_param(metaslab_fragmentation_factor_enabled, int, 0644);
MODULE_PARM_DESC(metaslab_fragmentation_factor_enabled, MODULE_PARM_DESC(metaslab_fragmentation_factor_enabled,
"use the fragmentation metric to prefer less fragmented metaslabs"); "use the fragmentation metric to prefer less fragmented metaslabs");
module_param(metaslab_lba_weighting_enabled, int, 0644);
MODULE_PARM_DESC(metaslab_lba_weighting_enabled, MODULE_PARM_DESC(metaslab_lba_weighting_enabled,
"prefer metaslabs with lower LBAs"); "prefer metaslabs with lower LBAs");
module_param(metaslab_bias_enabled, int, 0644);
MODULE_PARM_DESC(metaslab_bias_enabled, MODULE_PARM_DESC(metaslab_bias_enabled,
"enable metaslab group biasing"); "enable metaslab group biasing");
#endif /* _KERNEL && HAVE_SPL */ #endif /* _KERNEL && HAVE_SPL */

1
module/zfs/spa.c
View File

@ -6996,6 +6996,7 @@ module_param(spa_load_verify_data, int, 0644);
MODULE_PARM_DESC(spa_load_verify_data, MODULE_PARM_DESC(spa_load_verify_data,
"Set to traverse data on pool import"); "Set to traverse data on pool import");
/* CSTYLED */
module_param(zio_taskq_batch_pct, uint, 0444); module_param(zio_taskq_batch_pct, uint, 0444);
MODULE_PARM_DESC(zio_taskq_batch_pct, MODULE_PARM_DESC(zio_taskq_batch_pct,
"Percentage of CPUs to run an IO worker thread"); "Percentage of CPUs to run an IO worker thread");

3
module/zfs/spa_misc.c
View File

@ -2093,9 +2093,9 @@ EXPORT_SYMBOL(spa_has_slogs);
EXPORT_SYMBOL(spa_is_root); EXPORT_SYMBOL(spa_is_root);
EXPORT_SYMBOL(spa_writeable); EXPORT_SYMBOL(spa_writeable);
EXPORT_SYMBOL(spa_mode); EXPORT_SYMBOL(spa_mode);
EXPORT_SYMBOL(spa_namespace_lock); EXPORT_SYMBOL(spa_namespace_lock);
/* BEGIN CSTYLED */
module_param(zfs_flags, uint, 0644); module_param(zfs_flags, uint, 0644);
MODULE_PARM_DESC(zfs_flags, "Set additional debugging flags"); MODULE_PARM_DESC(zfs_flags, "Set additional debugging flags");
@ -2118,4 +2118,5 @@ MODULE_PARM_DESC(spa_asize_inflation,
module_param(spa_slop_shift, int, 0644); module_param(spa_slop_shift, int, 0644);
MODULE_PARM_DESC(spa_slop_shift, "Reserved free space in pool"); MODULE_PARM_DESC(spa_slop_shift, "Reserved free space in pool");
/* END CSTYLED */
#endif #endif

3
module/zfs/zfs_vfsops.c
View File

@ -1222,8 +1222,9 @@ zfs_sb_prune(struct super_block *sb, unsigned long nr_to_scan, int *objects)
defined(SHRINKER_NUMA_AWARE) defined(SHRINKER_NUMA_AWARE)
if (sb->s_shrink.flags & SHRINKER_NUMA_AWARE) { if (sb->s_shrink.flags & SHRINKER_NUMA_AWARE) {
*objects = 0; *objects = 0;
for_each_online_node(sc.nid) for_each_online_node(sc.nid) {
*objects += (*shrinker->scan_objects)(shrinker, &sc); *objects += (*shrinker->scan_objects)(shrinker, &sc);
}
} else { } else {
*objects = (*shrinker->scan_objects)(shrinker, &sc); *objects = (*shrinker->scan_objects)(shrinker, &sc);
} }

1
module/zfs/zfs_vnops.c
View File

@ -4932,6 +4932,7 @@ zfs_retzcbuf(struct inode *ip, xuio_t *xuio, cred_t *cr)
#endif /* HAVE_UIO_ZEROCOPY */ #endif /* HAVE_UIO_ZEROCOPY */
#if defined(_KERNEL) && defined(HAVE_SPL) #if defined(_KERNEL) && defined(HAVE_SPL)
/* CSTYLED */
module_param(zfs_delete_blocks, ulong, 0644); module_param(zfs_delete_blocks, ulong, 0644);
MODULE_PARM_DESC(zfs_delete_blocks, "Delete files larger than N blocks async"); MODULE_PARM_DESC(zfs_delete_blocks, "Delete files larger than N blocks async");
module_param(zfs_read_chunk_size, long, 0644); module_param(zfs_read_chunk_size, long, 0644);

5
module/zfs/zfs_znode.c
View File

@ -575,9 +575,7 @@ zfs_znode_alloc(zfs_sb_t *zsb, dmu_buf_t *db, int blksz,
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zsb), NULL, &mtime, 16); SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zsb), NULL, &mtime, 16);
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zsb), NULL, &ctime, 16); SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zsb), NULL, &ctime, 16);
if (sa_bulk_lookup(zp->z_sa_hdl, bulk, count) != 0 || if (sa_bulk_lookup(zp->z_sa_hdl, bulk, count) != 0 || tmp_gen == 0) {
tmp_gen == 0) {
if (hdl == NULL) if (hdl == NULL)
sa_handle_destroy(zp->z_sa_hdl); sa_handle_destroy(zp->z_sa_hdl);
zp->z_sa_hdl = NULL; zp->z_sa_hdl = NULL;
@ -2142,6 +2140,7 @@ zfs_obj_to_stats(objset_t *osp, uint64_t obj, zfs_stat_t *sb,
EXPORT_SYMBOL(zfs_create_fs); EXPORT_SYMBOL(zfs_create_fs);
EXPORT_SYMBOL(zfs_obj_to_path); EXPORT_SYMBOL(zfs_obj_to_path);
/* CSTYLED */
module_param(zfs_object_mutex_size, uint, 0644); module_param(zfs_object_mutex_size, uint, 0644);
MODULE_PARM_DESC(zfs_object_mutex_size, "Size of znode hold array"); MODULE_PARM_DESC(zfs_object_mutex_size, "Size of znode hold array");
#endif #endif

1
module/zfs/zil.c
View File

@ -2270,6 +2270,7 @@ MODULE_PARM_DESC(zil_replay_disable, "Disable intent logging replay");
module_param(zfs_nocacheflush, int, 0644); module_param(zfs_nocacheflush, int, 0644);
MODULE_PARM_DESC(zfs_nocacheflush, "Disable cache flushes"); MODULE_PARM_DESC(zfs_nocacheflush, "Disable cache flushes");
/* CSTYLED */
module_param(zil_slog_limit, ulong, 0644); module_param(zil_slog_limit, ulong, 0644);
MODULE_PARM_DESC(zil_slog_limit, "Max commit bytes to separate log device"); MODULE_PARM_DESC(zil_slog_limit, "Max commit bytes to separate log device");
#endif #endif

1
module/zfs/zpl_export.c
View File

@ -37,6 +37,7 @@ zpl_encode_fh(struct inode *ip, __u32 *fh, int *max_len, struct inode *parent)
#else #else
zpl_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len, int connectable) zpl_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len, int connectable)
{ {
/* CSTYLED */
struct inode *ip = dentry->d_inode; struct inode *ip = dentry->d_inode;
#endif /* HAVE_ENCODE_FH_WITH_INODE */ #endif /* HAVE_ENCODE_FH_WITH_INODE */
fstrans_cookie_t cookie; fstrans_cookie_t cookie;

1
module/zfs/zpl_inode.c
View File

@ -657,6 +657,7 @@ zpl_revalidate(struct dentry *dentry, struct nameidata *nd)
zpl_revalidate(struct dentry *dentry, unsigned int flags) zpl_revalidate(struct dentry *dentry, unsigned int flags)
{ {
#endif /* HAVE_D_REVALIDATE_NAMEIDATA */ #endif /* HAVE_D_REVALIDATE_NAMEIDATA */
/* CSTYLED */
zfs_sb_t *zsb = dentry->d_sb->s_fs_info; zfs_sb_t *zsb = dentry->d_sb->s_fs_info;
int error; int error;

2
module/zfs/zvol.c
View File

@ -2087,6 +2087,7 @@ zvol_fini(void)
mutex_destroy(&zvol_state_lock); mutex_destroy(&zvol_state_lock);
} }
/* BEGIN CSTYLED */
module_param(zvol_inhibit_dev, uint, 0644); module_param(zvol_inhibit_dev, uint, 0644);
MODULE_PARM_DESC(zvol_inhibit_dev, "Do not create zvol device nodes"); MODULE_PARM_DESC(zvol_inhibit_dev, "Do not create zvol device nodes");
@ -2098,3 +2099,4 @@ MODULE_PARM_DESC(zvol_max_discard_blocks, "Max number of blocks to discard");
module_param(zvol_prefetch_bytes, uint, 0644); module_param(zvol_prefetch_bytes, uint, 0644);
MODULE_PARM_DESC(zvol_prefetch_bytes, "Prefetch N bytes at zvol start+end"); MODULE_PARM_DESC(zvol_prefetch_bytes, "Prefetch N bytes at zvol start+end");
/* END CSTYLED */

27
tests/zfs-tests/cmd/xattrtest/xattrtest.c
View File

@ -289,7 +289,8 @@ run_process(const char *path, char *argv[])
} else if (pid > 0) { } else if (pid > 0) {
int status; int status;
while ((rc = waitpid(pid, &status, 0)) == -1 && errno == EINTR); while ((rc = waitpid(pid, &status, 0)) == -1 &&
errno == EINTR) { }
if (rc < 0 || !WIFEXITED(status)) if (rc < 0 || !WIFEXITED(status))
return (-1); return (-1);
@ -369,8 +370,8 @@ create_files(void)
file = malloc(PATH_MAX); file = malloc(PATH_MAX);
if (file == NULL) { if (file == NULL) {
rc = ENOMEM; rc = ENOMEM;
ERROR("Error %d: malloc(%d) bytes for file name\n", ERROR("Error %d: malloc(%d) bytes for file name\n", rc,
rc, PATH_MAX); PATH_MAX);
goto out; goto out;
} }
@ -454,16 +455,16 @@ setxattrs(void)
value = malloc(XATTR_SIZE_MAX); value = malloc(XATTR_SIZE_MAX);
if (value == NULL) { if (value == NULL) {
rc = ENOMEM; rc = ENOMEM;
ERROR("Error %d: malloc(%d) bytes for xattr value\n", ERROR("Error %d: malloc(%d) bytes for xattr value\n", rc,
rc, XATTR_SIZE_MAX); XATTR_SIZE_MAX);
goto out; goto out;
} }
file = malloc(PATH_MAX); file = malloc(PATH_MAX);
if (file == NULL) { if (file == NULL) {
rc = ENOMEM; rc = ENOMEM;
ERROR("Error %d: malloc(%d) bytes for file name\n", ERROR("Error %d: malloc(%d) bytes for file name\n", rc,
rc, PATH_MAX); PATH_MAX);
goto out; goto out;
} }
@ -525,16 +526,16 @@ getxattrs(void)
verify_value = malloc(XATTR_SIZE_MAX); verify_value = malloc(XATTR_SIZE_MAX);
if (verify_value == NULL) { if (verify_value == NULL) {
rc = ENOMEM; rc = ENOMEM;
ERROR("Error %d: malloc(%d) bytes for xattr verify\n", ERROR("Error %d: malloc(%d) bytes for xattr verify\n", rc,
rc, XATTR_SIZE_MAX); XATTR_SIZE_MAX);
goto out; goto out;
} }
value = malloc(XATTR_SIZE_MAX); value = malloc(XATTR_SIZE_MAX);
if (value == NULL) { if (value == NULL) {
rc = ENOMEM; rc = ENOMEM;
ERROR("Error %d: malloc(%d) bytes for xattr value\n", ERROR("Error %d: malloc(%d) bytes for xattr value\n", rc,
rc, XATTR_SIZE_MAX); XATTR_SIZE_MAX);
goto out; goto out;
} }
@ -544,8 +545,8 @@ getxattrs(void)
file = malloc(PATH_MAX); file = malloc(PATH_MAX);
if (file == NULL) { if (file == NULL) {
rc = ENOMEM; rc = ENOMEM;
ERROR("Error %d: malloc(%d) bytes for file name\n", ERROR("Error %d: malloc(%d) bytes for file name\n", rc,
rc, PATH_MAX); PATH_MAX);
goto out; goto out;
} }