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

codebase style improvements for OpenZFS 6459 port

Browse Source
This commit is contained in:
George Melikov 2017-01-21 00:17:55 +03:00 committed by Brian Behlendorf
parent ec441a9c53
commit 4ea3f86426
46 changed files with 202 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/zpool/zpool_main.c
View File

@ -2953,7 +2953,8 @@ struct stat_array {
};
static uint64_t
stat_histo_max(struct stat_array *nva, unsigned int len) {
stat_histo_max(struct stat_array *nva, unsigned int len)
{
uint64_t max = 0;
int i;
for (i = 0; i < len; i++)
@ -2969,7 +2970,8 @@ stat_histo_max(struct stat_array *nva, unsigned int len) {
*/
static int
nvpair64_to_stat_array(nvlist_t *nvl, const char *name,
struct stat_array *nva) {
struct stat_array *nva)
{
nvpair_t *tmp;
int ret;
@ -3871,7 +3873,8 @@ is_pool(char *name)
/* Are all our argv[] strings pool names? If so return 1, 0 otherwise. */
static int
are_all_pools(int argc, char **argv) {
are_all_pools(int argc, char **argv)
{
if ((argc == 0) || !*argv)
return (0);
@ -3952,7 +3955,8 @@ get_interval_count_filter_guids(int *argc, char **argv, float *interval,
* seconds.
*/
static void
fsleep(float sec) {
fsleep(float sec)
{
struct timespec req;
req.tv_sec = floor(sec);
req.tv_nsec = (sec - (float)req.tv_sec) * NANOSEC;

6
cmd/zpool/zpool_util.c
View File

@ -88,7 +88,8 @@ num_logs(nvlist_t *nv)
/* Find the max element in an array of uint64_t values */
uint64_t
array64_max(uint64_t array[], unsigned int len) {
array64_max(uint64_t array[], unsigned int len)
{
uint64_t max = 0;
int i;
for (i = 0; i < len; i++)
@ -102,7 +103,8 @@ array64_max(uint64_t array[], unsigned int len) {
* floating point numbers.
*/
int
isnumber(char *str) {
isnumber(char *str)
{
for (; *str; str++)
if (!(isdigit(*str) || (*str == '.')))
return (0);

12
include/linux/vfs_compat.h
View File

@ -225,7 +225,8 @@ zpl_posix_acl_release(struct posix_acl *acl)
#define zpl_forget_cached_acl(ip, ty) forget_cached_acl(ip, ty)
#else
static inline void
zpl_set_cached_acl(struct inode *ip, int type, struct posix_acl *newer) {
zpl_set_cached_acl(struct inode *ip, int type, struct posix_acl *newer)
{
struct posix_acl *older = NULL;
spin_lock(&ip->i_lock);
@ -250,7 +251,8 @@ zpl_set_cached_acl(struct inode *ip, int type, struct posix_acl *newer) {
}
static inline void
zpl_forget_cached_acl(struct inode *ip, int type) {
zpl_forget_cached_acl(struct inode *ip, int type)
{
zpl_set_cached_acl(ip, type, (struct posix_acl *)ACL_NOT_CACHED);
}
#endif /* HAVE_SET_CACHED_ACL_USABLE */
@ -261,7 +263,8 @@ zpl_forget_cached_acl(struct inode *ip, int type) {
#define __posix_acl_create(acl, gfp, mode) posix_acl_create(acl, gfp, mode)
#else
static inline int
__posix_acl_chmod(struct posix_acl **acl, int flags, umode_t umode) {
__posix_acl_chmod(struct posix_acl **acl, int flags, umode_t umode)
{
struct posix_acl *oldacl = *acl;
mode_t mode = umode;
int error;
@ -282,7 +285,8 @@ __posix_acl_chmod(struct posix_acl **acl, int flags, umode_t umode) {
}
static inline int
__posix_acl_create(struct posix_acl **acl, int flags, umode_t *umodep) {
__posix_acl_create(struct posix_acl **acl, int flags, umode_t *umodep)
{
struct posix_acl *oldacl = *acl;
mode_t mode = *umodep;
int error;

2
include/sys/trace_acl.h
View File

@ -139,9 +139,11 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
/* END CSTYLED */
#define DEFINE_ACE_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_ace_class, name, \
TP_PROTO(znode_t *zn, zfs_ace_hdr_t *ace, uint32_t mask_matched), \
TP_ARGS(zn, ace, mask_matched))
/* END CSTYLED */
DEFINE_ACE_EVENT(zfs_zfs__ace__denies);
DEFINE_ACE_EVENT(zfs_zfs__ace__allows);

10
include/sys/trace_arc.h
View File

@ -98,9 +98,11 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
/* END CSTYLED */
#define DEFINE_ARC_BUF_HDR_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_arc_buf_hdr_class, name, \
TP_PROTO(arc_buf_hdr_t *ab), \
TP_ARGS(ab))
/* END CSTYLED */
DEFINE_ARC_BUF_HDR_EVENT(zfs_arc__hit);
DEFINE_ARC_BUF_HDR_EVENT(zfs_arc__evict);
DEFINE_ARC_BUF_HDR_EVENT(zfs_arc__delete);
@ -141,9 +143,11 @@ DECLARE_EVENT_CLASS(zfs_l2arc_rw_class,
/* END CSTYLED */
#define DEFINE_L2ARC_RW_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_l2arc_rw_class, name, \
TP_PROTO(vdev_t *vd, zio_t *zio), \
TP_ARGS(vd, zio))
/* END CSTYLED */
DEFINE_L2ARC_RW_EVENT(zfs_l2arc__read);
DEFINE_L2ARC_RW_EVENT(zfs_l2arc__write);
@ -166,9 +170,11 @@ DECLARE_EVENT_CLASS(zfs_l2arc_iodone_class,
/* END CSTYLED */
#define DEFINE_L2ARC_IODONE_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_l2arc_iodone_class, name, \
TP_PROTO(zio_t *zio, l2arc_write_callback_t *cb), \
TP_ARGS(zio, cb))
/* END CSTYLED */
DEFINE_L2ARC_IODONE_EVENT(zfs_l2arc__iodone);
@ -278,10 +284,12 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
/* END CSTYLED */
#define DEFINE_ARC_MISS_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_arc_miss_class, name, \
TP_PROTO(arc_buf_hdr_t *hdr, \
const blkptr_t *bp, uint64_t size, const zbookmark_phys_t *zb), \
TP_ARGS(hdr, bp, size, zb))
/* END CSTYLED */
DEFINE_ARC_MISS_EVENT(zfs_arc__miss);
/*
@ -337,10 +345,12 @@ DECLARE_EVENT_CLASS(zfs_l2arc_evict_class,
/* END CSTYLED */
#define DEFINE_L2ARC_EVICT_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_l2arc_evict_class, name, \
TP_PROTO(l2arc_dev_t *dev, \
list_t *buflist, uint64_t taddr, boolean_t all), \
TP_ARGS(dev, buflist, taddr, all))
/* END CSTYLED */
DEFINE_L2ARC_EVICT_EVENT(zfs_l2arc__evict);
#endif /* _TRACE_ARC_H */

6
include/sys/trace_dbgmsg.h
View File

@ -69,10 +69,12 @@ DECLARE_EVENT_CLASS(zfs_dprintf_class,
/* END CSTYLED */
#define DEFINE_DPRINTF_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_dprintf_class, name, \
TP_PROTO(const char *file, const char *function, int line, \
const char *msg), \
TP_ARGS(file, function, line, msg))
/* END CSTYLED */
DEFINE_DPRINTF_EVENT(zfs_zfs__dprintf);
/*
@ -109,16 +111,20 @@ DECLARE_EVENT_CLASS(zfs_set_error_class,
#ifdef TP_CONDITION
#define DEFINE_SET_ERROR_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT_CONDITION(zfs_set_error_class, name, \
TP_PROTO(const char *file, const char *function, int line, \
uintptr_t error), \
TP_ARGS(file, function, line, error), \
TP_CONDITION(error))
/* END CSTYLED */
#else
#define DEFINE_SET_ERROR_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_set_error_class, name, \
TP_PROTO(const char *file, const char *function, int line, \
uintptr_t error), \
TP_ARGS(file, function, line, error))
/* END CSTYLED */
#endif
DEFINE_SET_ERROR_EVENT(zfs_set__error);

8
include/sys/trace_dbuf.h
View File

@ -78,6 +78,7 @@
__entry->db_blkid, __entry->db_offset, \
__entry->db_size, __entry->db_state, __entry->db_holds
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_dbuf_class,
TP_PROTO(dmu_buf_impl_t *db, zio_t *zio),
TP_ARGS(db, zio),
@ -85,13 +86,17 @@ DECLARE_EVENT_CLASS(zfs_dbuf_class,
TP_fast_assign(DBUF_TP_FAST_ASSIGN),
TP_printk(DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS)
);
/* END CSTYLED */
#define DEFINE_DBUF_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_dbuf_class, name, \
TP_PROTO(dmu_buf_impl_t *db, zio_t *zio), \
TP_ARGS(db, zio))
/* END CSTYLED */
DEFINE_DBUF_EVENT(zfs_blocked__read);
/* BEGIN CSTYLED */
DECLARE_EVENT_CLASS(zfs_dbuf_evict_one_class,
TP_PROTO(dmu_buf_impl_t *db, multilist_sublist_t *mls),
TP_ARGS(db, mls),
@ -99,11 +104,14 @@ DECLARE_EVENT_CLASS(zfs_dbuf_evict_one_class,
TP_fast_assign(DBUF_TP_FAST_ASSIGN),
TP_printk(DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS)
);
/* END CSTYLED */
#define DEFINE_DBUF_EVICT_ONE_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_dbuf_evict_one_class, name, \
TP_PROTO(dmu_buf_impl_t *db, multilist_sublist_t *mls), \
TP_ARGS(db, mls))
/* END CSTYLED */
DEFINE_DBUF_EVICT_ONE_EVENT(zfs_dbuf__evict__one);
#endif /* _TRACE_DBUF_H */

2
include/sys/trace_dmu.h
View File

@ -105,9 +105,11 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
/* END CSTYLED */
#define DEFINE_DELAY_MINTIME_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_delay_mintime_class, name, \
TP_PROTO(dmu_tx_t *tx, uint64_t dirty, uint64_t min_tx_time), \
TP_ARGS(tx, dirty, min_tx_time))
/* END CSTYLED */
DEFINE_DELAY_MINTIME_EVENT(zfs_delay__mintime);
#endif /* _TRACE_DMU_H */

2
include/sys/trace_dnode.h
View File

@ -105,9 +105,11 @@ DECLARE_EVENT_CLASS(zfs_dnode_move_class,
/* END CSTYLED */
#define DEFINE_DNODE_MOVE_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_dnode_move_class, name, \
TP_PROTO(dnode_t *dn, int64_t refcount, uint32_t dbufs), \
TP_ARGS(dn, refcount, dbufs))
/* END CSTYLED */
DEFINE_DNODE_MOVE_EVENT(zfs_dnode__move);
#endif /* _TRACE_DNODE_H */

2
include/sys/trace_multilist.h
View File

@ -63,9 +63,11 @@ DECLARE_EVENT_CLASS(zfs_multilist_insert_remove_class,
/* END CSTYLED */
#define DEFINE_MULTILIST_INSERT_REMOVE_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_multilist_insert_remove_class, name, \
TP_PROTO(multilist_t *ml, unsigned int sublist_idx, void *obj), \
TP_ARGS(ml, sublist_idx, obj))
/* END CSTYLED */
DEFINE_MULTILIST_INSERT_REMOVE_EVENT(zfs_multilist__insert);
DEFINE_MULTILIST_INSERT_REMOVE_EVENT(zfs_multilist__remove);

2
include/sys/trace_txg.h
View File

@ -55,9 +55,11 @@ DECLARE_EVENT_CLASS(zfs_txg_class,
/* END CSTYLED */
#define DEFINE_TXG_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_txg_class, name, \
TP_PROTO(dsl_pool_t *dp, uint64_t txg), \
TP_ARGS(dp, txg))
/* END CSTYLED */
DEFINE_TXG_EVENT(zfs_dsl_pool_sync__done);
DEFINE_TXG_EVENT(zfs_txg__quiescing);
DEFINE_TXG_EVENT(zfs_txg__opened);

2
include/sys/trace_zil.h
View File

@ -114,11 +114,13 @@ DECLARE_EVENT_CLASS(zfs_zil_class,
/* END CSTYLED */
#define DEFINE_ZIL_EVENT(name) \
/* BEGIN CSTYLED */
DEFINE_EVENT(zfs_zil_class, name, \
TP_PROTO(zilog_t *zilog), \
TP_ARGS(zilog))
DEFINE_ZIL_EVENT(zfs_zil__cw1);
DEFINE_ZIL_EVENT(zfs_zil__cw2);
/* END CSTYLED */
#endif /* _TRACE_ZIL_H */

3
lib/libnvpair/libnvpair.c
View File

@ -475,7 +475,8 @@ NVLIST_PRINTCTL_AREPLACE(nvlist_array, nvlist_t **)
*/
static const struct nvlist_printops defprtops = {
static const struct nvlist_printops defprtops =
{
{ nvprint_boolean, NULL },
{ nvprint_boolean_value, NULL },
{ nvprint_byte, NULL },

6
lib/libshare/libshare.c
View File

@ -108,7 +108,8 @@ libshare_init(void)
}
static void
parse_sharetab(sa_handle_impl_t impl_handle) {
parse_sharetab(sa_handle_impl_t impl_handle)
{
FILE *fp;
char line[512];
char *eol, *pathname, *resource, *fstype, *options, *description;
@ -759,7 +760,8 @@ alloc_share(const char *sharepath)
}
static void
free_share(sa_share_impl_t impl_share) {
free_share(sa_share_impl_t impl_share)
{
sa_fstype_t *fstype;
fstype = fstypes;

12
lib/libspl/include/sys/byteorder.h
View File

@ -130,22 +130,26 @@ extern in_port_t ntohs(in_port_t);
#ifdef _BIG_ENDIAN
static __inline__ uint64_t
htonll(uint64_t n) {
htonll(uint64_t n)
{
return (n);
}
static __inline__ uint64_t
ntohll(uint64_t n) {
ntohll(uint64_t n)
{
return (n);
}
#else
static __inline__ uint64_t
htonll(uint64_t n) {
htonll(uint64_t n)
{
return ((((uint64_t)htonl(n)) << 32) + htonl(n >> 32));
}
static __inline__ uint64_t
ntohll(uint64_t n) {
ntohll(uint64_t n)
{
return ((((uint64_t)ntohl(n)) << 32) + ntohl(n >> 32));
}
#endif

3
lib/libspl/include/umem.h
View File

@ -131,7 +131,8 @@ umem_free(void *ptr, size_t size)
}
static inline void
umem_nofail_callback(umem_nofail_callback_t *cb) {}
umem_nofail_callback(umem_nofail_callback_t *cb)
{}
static inline umem_cache_t *
umem_cache_create(

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

@ -988,7 +988,8 @@ aes_setupkeys(aes_key_t *key, const uint32_t *keyarr32, int keybits)
*/
static void
rijndael_encrypt(const uint32_t rk[], int Nr, const uint32_t pt[4],
uint32_t ct[4], int flags) {
uint32_t ct[4], int flags)
{
if (flags & INTEL_AES_NI_CAPABLE) {
KPREEMPT_DISABLE;
aes_encrypt_intel(rk, Nr, pt, ct);
@ -1015,7 +1016,8 @@ rijndael_encrypt(const uint32_t rk[], int Nr, const uint32_t pt[4],
*/
static void
rijndael_decrypt(const uint32_t rk[], int Nr, const uint32_t ct[4],
uint32_t pt[4], int flags) {
uint32_t pt[4], int flags)
{
if (flags & INTEL_AES_NI_CAPABLE) {
KPREEMPT_DISABLE;
aes_decrypt_intel(rk, Nr, ct, pt);

11
module/icp/algs/skein/skein_block.c
View File

@ -57,11 +57,10 @@
/* Skein_256 */
#if !(SKEIN_USE_ASM & 256)
void
Skein_256_Process_Block(Skein_256_Ctxt_t *ctx, const uint8_t *blkPtr,
size_t blkCnt, size_t byteCntAdd)
{ /* do it in C */
{
enum {
WCNT = SKEIN_256_STATE_WORDS
};
@ -239,8 +238,7 @@ Skein_256_Process_Block(Skein_256_Ctxt_t *ctx, const uint8_t *blkPtr,
Skein_Show_Round(BLK_BITS, &ctx->h, SKEIN_RND_FEED_FWD, ctx->X);
ts[1] &= ~SKEIN_T1_FLAG_FIRST;
}
while (--blkCnt);
} while (--blkCnt);
ctx->h.T[0] = ts[0];
ctx->h.T[1] = ts[1];
}
@ -266,7 +264,7 @@ Skein_256_Unroll_Cnt(void)
void
Skein_512_Process_Block(Skein_512_Ctxt_t *ctx, const uint8_t *blkPtr,
size_t blkCnt, size_t byteCntAdd)
{ /* do it in C */
{
enum {
WCNT = SKEIN_512_STATE_WORDS
};
@ -470,8 +468,7 @@ Skein_512_Process_Block(Skein_512_Ctxt_t *ctx, const uint8_t *blkPtr,
Skein_Show_Round(BLK_BITS, &ctx->h, SKEIN_RND_FEED_FWD, ctx->X);
ts[1] &= ~SKEIN_T1_FLAG_FIRST;
}
while (--blkCnt);
} while (--blkCnt);
ctx->h.T[0] = ts[0];
ctx->h.T[1] = ts[1];
}

6
module/icp/io/aes.c
View File

@ -321,14 +321,16 @@ aes_provider_status(crypto_provider_handle_t provider, uint_t *status)
static int
aes_encrypt_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism,
crypto_key_t *key, crypto_spi_ctx_template_t template,
crypto_req_handle_t req) {
crypto_req_handle_t req)
{
return (aes_common_init(ctx, mechanism, key, template, req, B_TRUE));
}
static int
aes_decrypt_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism,
crypto_key_t *key, crypto_spi_ctx_template_t template,
crypto_req_handle_t req) {
crypto_req_handle_t req)
{
return (aes_common_init(ctx, mechanism, key, template, req, B_FALSE));
}

3
module/icp/io/edonr_mod.c
View File

@ -57,6 +57,7 @@ edonr_mod_init(void)
}
int
edonr_mod_fini(void) {
edonr_mod_fini(void)
{
return (mod_remove(&modlinkage));
}

3
module/icp/io/skein_mod.c
View File

@ -230,7 +230,8 @@ skein_mod_init(void)
}
int
skein_mod_fini(void) {
skein_mod_fini(void)
{
int ret;
if (skein_prov_handle != 0) {

9
module/unicode/u8_textprep.c
View File

@ -1379,10 +1379,8 @@ SAFE_RETURN:
*/
static size_t
collect_a_seq(size_t uv, uchar_t *u8s, uchar_t **source, uchar_t *slast,
boolean_t is_it_toupper,
boolean_t is_it_tolower,
boolean_t canonical_decomposition,
boolean_t compatibility_decomposition,
boolean_t is_it_toupper, boolean_t is_it_tolower,
boolean_t canonical_decomposition, boolean_t compatibility_decomposition,
boolean_t canonical_composition,
int *errnum, u8_normalization_states_t *state)
{
@ -2134,7 +2132,8 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
#if defined(_KERNEL) && defined(HAVE_SPL)
static int __init
unicode_init(void) {
unicode_init(void)
{
return (0);
}

6
module/zcommon/zfs_fletcher_sse.c
View File

@ -50,12 +50,14 @@
#include <strings.h>
static void
fletcher_4_sse2_init(fletcher_4_ctx_t *ctx) {
fletcher_4_sse2_init(fletcher_4_ctx_t *ctx)
{
bzero(ctx->sse, 4 * sizeof (zfs_fletcher_sse_t));
}
static void
fletcher_4_sse2_fini(fletcher_4_ctx_t *ctx, zio_cksum_t *zcp) {
fletcher_4_sse2_fini(fletcher_4_ctx_t *ctx, zio_cksum_t *zcp)
{
uint64_t A, B, C, D;
/*

3
module/zfs/abd.c
View File

@ -423,7 +423,8 @@ struct scatterlist {
};
static void
sg_init_table(struct scatterlist *sg, int nr) {
sg_init_table(struct scatterlist *sg, int nr)
{
memset(sg, 0, nr * sizeof (struct scatterlist));
sg[nr - 1].end = 1;
}

3
module/zfs/arc.c
View File

@ -4336,7 +4336,8 @@ arc_reclaim_thread(void)
* increase this negative difference.
*/
static uint64_t
arc_evictable_memory(void) {
arc_evictable_memory(void)
{
uint64_t arc_clean =
refcount_count(&arc_mru->arcs_esize[ARC_BUFC_DATA]) +
refcount_count(&arc_mru->arcs_esize[ARC_BUFC_METADATA]) +

3
module/zfs/spa_misc.c
View File

@ -1612,7 +1612,8 @@ spa_get_asize(spa_t *spa, uint64_t lsize)
* See the comment above spa_slop_shift for details.
*/
uint64_t
spa_get_slop_space(spa_t *spa) {
spa_get_slop_space(spa_t *spa)
{
uint64_t space = spa_get_dspace(spa);
return (MAX(space >> spa_slop_shift, SPA_MINDEVSIZE >> 1));
}

3
module/zfs/vdev.c
View File

@ -3676,9 +3676,10 @@ EXPORT_SYMBOL(vdev_degrade);
EXPORT_SYMBOL(vdev_online);
EXPORT_SYMBOL(vdev_offline);
EXPORT_SYMBOL(vdev_clear);
/* BEGIN CSTYLED */
module_param(metaslabs_per_vdev, int, 0644);
MODULE_PARM_DESC(metaslabs_per_vdev,
"Divide added vdev into approximately (but no more than) this number "
"of metaslabs");
/* END CSTYLED */
#endif

4
module/zfs/vdev_mirror.c
View File

@ -646,6 +646,7 @@ vdev_ops_t vdev_spare_ops = {
};
#if defined(_KERNEL) && defined(HAVE_SPL)
/* BEGIN CSTYLED */
module_param(zfs_vdev_mirror_rotating_inc, int, 0644);
MODULE_PARM_DESC(zfs_vdev_mirror_rotating_inc,
"Rotating media load increment for non-seeking I/O's");
@ -655,6 +656,7 @@ MODULE_PARM_DESC(zfs_vdev_mirror_rotating_seek_inc,
"Rotating media load increment for seeking I/O's");
module_param(zfs_vdev_mirror_rotating_seek_offset, int, 0644);
MODULE_PARM_DESC(zfs_vdev_mirror_rotating_seek_offset,
"Offset in bytes from the last I/O which "
"triggers a reduced rotating media seek increment");
@ -666,5 +668,5 @@ MODULE_PARM_DESC(zfs_vdev_mirror_non_rotating_inc,
module_param(zfs_vdev_mirror_non_rotating_seek_inc, int, 0644);
MODULE_PARM_DESC(zfs_vdev_mirror_non_rotating_seek_inc,
"Non-rotating media load increment for seeking I/O's");
/* END CSTYLED */
#endif

4
module/zfs/vdev_raidz_math_aarch64_neon.c
View File

@ -223,7 +223,7 @@ const raidz_impl_ops_t vdev_raidz_aarch64_neon_impl = {
#if defined(__aarch64__)
/* BEGIN CSTYLED */
const uint8_t
__attribute__((aligned(256))) gf_clmul_mod_lt[4*256][16] = {
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@ -2275,5 +2275,5 @@ __attribute__((aligned(256))) gf_clmul_mod_lt[4*256][16] = {
{ 0x00, 0xff, 0xfe, 0x01, 0xfc, 0x03, 0x02, 0xfd,
0xf8, 0x07, 0x06, 0xf9, 0x04, 0xfb, 0xfa, 0x05 }
};
/* END CSTYLED */
#endif /* defined(__aarch64__) */

7
module/zfs/vdev_raidz_math_ssse3.c
View File

@ -417,9 +417,10 @@ const raidz_impl_ops_t vdev_raidz_ssse3_impl = {
#if defined(__x86_64)
#if defined(HAVE_SSSE3) || defined(HAVE_AVX2) || defined(HAVE_AVX512BW)
/* BEGIN CSTYLED */
const uint8_t
__attribute__((aligned(256))) gf_clmul_mod_lt[4*256][16] = {
__attribute__((aligned(256))) gf_clmul_mod_lt[4*256][16] =
{
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@ -2469,6 +2470,6 @@ __attribute__((aligned(256))) gf_clmul_mod_lt[4*256][16] = {
{ 0x00, 0xff, 0xfe, 0x01, 0xfc, 0x03, 0x02, 0xfd,
0xf8, 0x07, 0x06, 0xf9, 0x04, 0xfb, 0xfa, 0x05 }
};
/* END CSTYLED */
#endif /* defined(HAVE_SSSE3) || defined(HAVE_AVX2) || defined(HAVE_AVX512BW) */
#endif /* defined(__x86_64) */

3
module/zfs/zvol.c
View File

@ -1934,7 +1934,8 @@ typedef struct zvol_snapdev_cb_arg {
} zvol_snapdev_cb_arg_t;
static int
zvol_set_snapdev_cb(const char *dsname, void *param) {
zvol_set_snapdev_cb(const char *dsname, void *param)
{
zvol_snapdev_cb_arg_t *arg = param;
if (strchr(dsname, '@') == NULL)

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

@ -98,7 +98,8 @@ static char script[PATH_MAX] = "/bin/true";
static char xattrbytes[XATTR_SIZE_MAX];
static int
usage(int argc, char **argv) {
usage(int argc, char **argv)
{
fprintf(stderr,
"usage: %s [-hvycdrRk] [-n <nth>] [-f <files>] [-x <xattrs>]\n"
" [-s <bytes>] [-p <path>] [-t <script> ] [-o <phase>]\n",