mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
Use cstyle -cpP in make cstyle check
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:
@@ -1593,18 +1593,17 @@ intel_aes_instructions_present(void)
|
||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||
: "a"(func), "c"(subfunc));
|
||||
|
||||
if (memcmp((char *) (&ebx), "Genu", 4) == 0 &&
|
||||
memcmp((char *) (&edx), "ineI", 4) == 0 &&
|
||||
memcmp((char *) (&ecx), "ntel", 4) == 0) {
|
||||
|
||||
if (memcmp((char *)(&ebx), "Genu", 4) == 0 &&
|
||||
memcmp((char *)(&edx), "ineI", 4) == 0 &&
|
||||
memcmp((char *)(&ecx), "ntel", 4) == 0) {
|
||||
func = 1;
|
||||
subfunc = 0;
|
||||
|
||||
/* check for aes-ni instruction set */
|
||||
__asm__ __volatile__(
|
||||
"cpuid"
|
||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||
: "a"(func), "c"(subfunc));
|
||||
"cpuid"
|
||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||
: "a"(func), "c"(subfunc));
|
||||
|
||||
cached_result = !!(ecx & INTEL_AESNI_FLAG);
|
||||
} else {
|
||||
|
||||
@@ -723,18 +723,17 @@ intel_pclmulqdq_instruction_present(void)
|
||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||
: "a"(func), "c"(subfunc));
|
||||
|
||||
if (memcmp((char *) (&ebx), "Genu", 4) == 0 &&
|
||||
memcmp((char *) (&edx), "ineI", 4) == 0 &&
|
||||
memcmp((char *) (&ecx), "ntel", 4) == 0) {
|
||||
|
||||
if (memcmp((char *)(&ebx), "Genu", 4) == 0 &&
|
||||
memcmp((char *)(&edx), "ineI", 4) == 0 &&
|
||||
memcmp((char *)(&ecx), "ntel", 4) == 0) {
|
||||
func = 1;
|
||||
subfunc = 0;
|
||||
|
||||
/* check for aes-ni instruction set */
|
||||
__asm__ __volatile__(
|
||||
"cpuid"
|
||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||
: "a"(func), "c"(subfunc));
|
||||
"cpuid"
|
||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||
: "a"(func), "c"(subfunc));
|
||||
|
||||
cached_result = !!(ecx & INTEL_PCLMULQDQ_FLAG);
|
||||
} else {
|
||||
|
||||
@@ -67,8 +67,9 @@ static uint_t prov_tab_max = KCF_MAX_PROVIDERS;
|
||||
void
|
||||
kcf_prov_tab_destroy(void)
|
||||
{
|
||||
if (prov_tab) kmem_free(prov_tab, prov_tab_max *
|
||||
sizeof (kcf_provider_desc_t *));
|
||||
if (prov_tab)
|
||||
kmem_free(prov_tab, prov_tab_max *
|
||||
sizeof (kcf_provider_desc_t *));
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -1062,7 +1062,7 @@ kcf_sched_destroy(void)
|
||||
for (i = 0; i < REQID_TABLES; i++) {
|
||||
if (kcf_reqid_table[i])
|
||||
kmem_free(kcf_reqid_table[i],
|
||||
sizeof (kcf_reqid_table_t));
|
||||
sizeof (kcf_reqid_table_t));
|
||||
}
|
||||
|
||||
if (gswq)
|
||||
|
||||
@@ -71,7 +71,7 @@ mod_install(struct modlinkage *modlp)
|
||||
|
||||
if (modlp->ml_rev != MODREV_1) {
|
||||
cmn_err(CE_WARN, "mod_install: "
|
||||
"modlinkage structure is not MODREV_1\n");
|
||||
"modlinkage structure is not MODREV_1\n");
|
||||
return (EINVAL);
|
||||
}
|
||||
linkpp = (struct modlmisc **)&modlp->ml_linkage[0];
|
||||
@@ -168,4 +168,4 @@ mod_info(struct modlinkage *modlp, struct modinfo *modinfop)
|
||||
if (retval == 0)
|
||||
return (1);
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -701,16 +701,13 @@ kcf_prov_kstat_update(kstat_t *ksp, int rw)
|
||||
|
||||
ks_data = ksp->ks_data;
|
||||
|
||||
ks_data->ps_ops_total.value.ui64 =
|
||||
pd->pd_sched_info.ks_ndispatches;
|
||||
ks_data->ps_ops_failed.value.ui64 =
|
||||
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_total.value.ui64 = pd->pd_sched_info.ks_ndispatches;
|
||||
ks_data->ps_ops_failed.value.ui64 = 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 =
|
||||
pd->pd_sched_info.ks_ndispatches -
|
||||
pd->pd_sched_info.ks_nfails -
|
||||
pd->pd_sched_info.ks_nbusy_rval;
|
||||
pd->pd_sched_info.ks_ndispatches -
|
||||
pd->pd_sched_info.ks_nfails -
|
||||
pd->pd_sched_info.ks_nbusy_rval;
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user