mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +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:
parent
d57f03e40e
commit
02730c333c
@ -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 \
|
||||||
|
@ -600,7 +600,7 @@ main(int argc, char **argv)
|
|||||||
gettext("filesystem '%s' (v%d) is not "
|
gettext("filesystem '%s' (v%d) is not "
|
||||||
"supported by this implementation of "
|
"supported by this implementation of "
|
||||||
"ZFS (max v%d).\n"), dataset,
|
"ZFS (max v%d).\n"), dataset,
|
||||||
(int) zfs_version, (int) ZPL_VERSION);
|
(int)zfs_version, (int)ZPL_VERSION);
|
||||||
} else {
|
} else {
|
||||||
(void) fprintf(stderr,
|
(void) fprintf(stderr,
|
||||||
gettext("filesystem '%s' mount "
|
gettext("filesystem '%s' mount "
|
||||||
|
@ -93,7 +93,7 @@ run_gen_bench_impl(const char *impl)
|
|||||||
start = gethrtime();
|
start = gethrtime();
|
||||||
for (iter = 0; iter < iter_cnt; iter++)
|
for (iter = 0; iter < iter_cnt; iter++)
|
||||||
vdev_raidz_generate_parity(rm_bench);
|
vdev_raidz_generate_parity(rm_bench);
|
||||||
elapsed = NSEC2SEC((double) (gethrtime() - start));
|
elapsed = NSEC2SEC((double)(gethrtime() - start));
|
||||||
|
|
||||||
disksize = (1ULL << ds) / rto_opts.rto_dcols;
|
disksize = (1ULL << ds) / rto_opts.rto_dcols;
|
||||||
d_bw = (double)iter_cnt * (double)disksize;
|
d_bw = (double)iter_cnt * (double)disksize;
|
||||||
@ -106,7 +106,7 @@ run_gen_bench_impl(const char *impl)
|
|||||||
(1ULL<<ds),
|
(1ULL<<ds),
|
||||||
d_bw,
|
d_bw,
|
||||||
d_bw * (double)(ncols),
|
d_bw * (double)(ncols),
|
||||||
(unsigned) iter_cnt);
|
(unsigned)iter_cnt);
|
||||||
|
|
||||||
vdev_raidz_map_free(rm_bench);
|
vdev_raidz_map_free(rm_bench);
|
||||||
}
|
}
|
||||||
@ -177,7 +177,7 @@ run_rec_bench_impl(const char *impl)
|
|||||||
start = gethrtime();
|
start = gethrtime();
|
||||||
for (iter = 0; iter < iter_cnt; iter++)
|
for (iter = 0; iter < iter_cnt; iter++)
|
||||||
vdev_raidz_reconstruct(rm_bench, tgt[fn], nbad);
|
vdev_raidz_reconstruct(rm_bench, tgt[fn], nbad);
|
||||||
elapsed = NSEC2SEC((double) (gethrtime() - start));
|
elapsed = NSEC2SEC((double)(gethrtime() - start));
|
||||||
|
|
||||||
disksize = (1ULL << ds) / rto_opts.rto_dcols;
|
disksize = (1ULL << ds) / rto_opts.rto_dcols;
|
||||||
d_bw = (double)iter_cnt * (double)(disksize);
|
d_bw = (double)iter_cnt * (double)(disksize);
|
||||||
@ -190,7 +190,7 @@ run_rec_bench_impl(const char *impl)
|
|||||||
(1ULL<<ds),
|
(1ULL<<ds),
|
||||||
d_bw,
|
d_bw,
|
||||||
d_bw * (double)ncols,
|
d_bw * (double)ncols,
|
||||||
(unsigned) iter_cnt);
|
(unsigned)iter_cnt);
|
||||||
|
|
||||||
vdev_raidz_map_free(rm_bench);
|
vdev_raidz_map_free(rm_bench);
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
@ -227,7 +225,7 @@ static int
|
|||||||
init_rand(void *data, size_t size, void *private)
|
init_rand(void *data, size_t size, void *private)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int *dst = (int *) data;
|
int *dst = (int *)data;
|
||||||
|
|
||||||
for (i = 0; i < size / sizeof (int); i++)
|
for (i = 0; i < size / sizeof (int); i++)
|
||||||
dst[i] = rand_data[i];
|
dst[i] = rand_data[i];
|
||||||
@ -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;
|
||||||
@ -607,7 +602,7 @@ static void
|
|||||||
sweep_thread(void *arg)
|
sweep_thread(void *arg)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
raidz_test_opts_t *opts = (raidz_test_opts_t *) arg;
|
raidz_test_opts_t *opts = (raidz_test_opts_t *)arg;
|
||||||
VERIFY(opts != NULL);
|
VERIFY(opts != NULL);
|
||||||
|
|
||||||
err = run_test(opts);
|
err = run_test(opts);
|
||||||
@ -708,7 +703,7 @@ run_sweep(void)
|
|||||||
opts->rto_v = 0; /* be quiet */
|
opts->rto_v = 0; /* be quiet */
|
||||||
|
|
||||||
VERIFY3P(zk_thread_create(NULL, 0,
|
VERIFY3P(zk_thread_create(NULL, 0,
|
||||||
(thread_func_t) sweep_thread,
|
(thread_func_t)sweep_thread,
|
||||||
(void *) opts, TS_RUN, NULL, 0, 0,
|
(void *) opts, TS_RUN, NULL, 0, 0,
|
||||||
PTHREAD_CREATE_JOINABLE), !=, NULL);
|
PTHREAD_CREATE_JOINABLE), !=, NULL);
|
||||||
}
|
}
|
||||||
@ -765,7 +760,7 @@ main(int argc, char **argv)
|
|||||||
kernel_init(FREAD);
|
kernel_init(FREAD);
|
||||||
|
|
||||||
/* setup random data because rand() is not reentrant */
|
/* setup random data because rand() is not reentrant */
|
||||||
rand_data = (int *) umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL);
|
rand_data = (int *)umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL);
|
||||||
srand((unsigned)time(NULL) * getpid());
|
srand((unsigned)time(NULL) * getpid());
|
||||||
for (i = 0; i < SPA_MAXBLOCKSIZE / sizeof (int); i++)
|
for (i = 0; i < SPA_MAXBLOCKSIZE / sizeof (int); i++)
|
||||||
rand_data[i] = rand();
|
rand_data[i] = rand();
|
||||||
|
@ -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
|
||||||
|
@ -343,7 +343,7 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
|
|||||||
list_insert_tail(&g_device_list, device);
|
list_insert_tail(&g_device_list, device);
|
||||||
|
|
||||||
zed_log_msg(LOG_INFO, " zpool_label_disk: async '%s' (%llu)",
|
zed_log_msg(LOG_INFO, " zpool_label_disk: async '%s' (%llu)",
|
||||||
leafname, (u_longlong_t) guid);
|
leafname, (u_longlong_t)guid);
|
||||||
|
|
||||||
return; /* resumes at EC_DEV_ADD.ESC_DISK for partition */
|
return; /* resumes at EC_DEV_ADD.ESC_DISK for partition */
|
||||||
|
|
||||||
@ -373,7 +373,7 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
|
|||||||
}
|
}
|
||||||
|
|
||||||
zed_log_msg(LOG_INFO, " zpool_label_disk: resume '%s' (%llu)",
|
zed_log_msg(LOG_INFO, " zpool_label_disk: resume '%s' (%llu)",
|
||||||
physpath, (u_longlong_t) guid);
|
physpath, (u_longlong_t)guid);
|
||||||
|
|
||||||
(void) snprintf(devpath, sizeof (devpath), "%s%s",
|
(void) snprintf(devpath, sizeof (devpath), "%s%s",
|
||||||
DEV_BYID_PATH, new_devid);
|
DEV_BYID_PATH, new_devid);
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -255,7 +255,7 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
zed_log_msg(LOG_NOTICE,
|
zed_log_msg(LOG_NOTICE,
|
||||||
"ZFS Event Daemon %s-%s (PID %d)",
|
"ZFS Event Daemon %s-%s (PID %d)",
|
||||||
ZFS_META_VERSION, ZFS_META_RELEASE, (int) getpid());
|
ZFS_META_VERSION, ZFS_META_RELEASE, (int)getpid());
|
||||||
|
|
||||||
if (zed_conf_open_state(zcp) < 0)
|
if (zed_conf_open_state(zcp) < 0)
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
|
@ -513,7 +513,7 @@ zed_conf_write_pid(struct zed_conf *zcp)
|
|||||||
/*
|
/*
|
||||||
* Write PID file.
|
* Write PID file.
|
||||||
*/
|
*/
|
||||||
n = snprintf(buf, sizeof (buf), "%d\n", (int) getpid());
|
n = snprintf(buf, sizeof (buf), "%d\n", (int)getpid());
|
||||||
if ((n < 0) || (n >= sizeof (buf))) {
|
if ((n < 0) || (n >= sizeof (buf))) {
|
||||||
errno = ERANGE;
|
errno = ERANGE;
|
||||||
zed_log_msg(LOG_ERR, "Failed to write PID file \"%s\": %s",
|
zed_log_msg(LOG_ERR, "Failed to write PID file \"%s\": %s",
|
||||||
@ -637,7 +637,7 @@ zed_conf_read_state(struct zed_conf *zcp, uint64_t *eidp, int64_t etime[])
|
|||||||
"Failed to read state file: %s", strerror(errno));
|
"Failed to read state file: %s", strerror(errno));
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if (lseek(zcp->state_fd, 0, SEEK_SET) == (off_t) -1) {
|
if (lseek(zcp->state_fd, 0, SEEK_SET) == (off_t)-1) {
|
||||||
zed_log_msg(LOG_WARNING,
|
zed_log_msg(LOG_WARNING,
|
||||||
"Failed to reposition state file offset: %s",
|
"Failed to reposition state file offset: %s",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
@ -687,7 +687,7 @@ zed_conf_write_state(struct zed_conf *zcp, uint64_t eid, int64_t etime[])
|
|||||||
"Failed to write state file: %s", strerror(errno));
|
"Failed to write state file: %s", strerror(errno));
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if (lseek(zcp->state_fd, 0, SEEK_SET) == (off_t) -1) {
|
if (lseek(zcp->state_fd, 0, SEEK_SET) == (off_t)-1) {
|
||||||
zed_log_msg(LOG_WARNING,
|
zed_log_msg(LOG_WARNING,
|
||||||
"Failed to reposition state file offset: %s",
|
"Failed to reposition state file offset: %s",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
@ -283,7 +283,7 @@ zed_udev_monitor(void *arg)
|
|||||||
if (strcmp(class, EC_DEV_STATUS) == 0 &&
|
if (strcmp(class, EC_DEV_STATUS) == 0 &&
|
||||||
udev_device_get_property_value(dev, "DM_UUID") &&
|
udev_device_get_property_value(dev, "DM_UUID") &&
|
||||||
udev_device_get_property_value(dev, "MPATH_SBIN_PATH")) {
|
udev_device_get_property_value(dev, "MPATH_SBIN_PATH")) {
|
||||||
tmp = (char *) udev_device_get_devnode(dev);
|
tmp = (char *)udev_device_get_devnode(dev);
|
||||||
tmp2 = zfs_get_underlying_path(tmp);
|
tmp2 = zfs_get_underlying_path(tmp);
|
||||||
if (tmp && tmp2 && (strcmp(tmp, tmp2) != 0)) {
|
if (tmp && tmp2 && (strcmp(tmp, tmp2) != 0)) {
|
||||||
/*
|
/*
|
||||||
|
@ -489,7 +489,7 @@ _zed_event_add_int64_array(uint64_t eid, zed_strings_t *zsp,
|
|||||||
name = nvpair_name(nvp);
|
name = nvpair_name(nvp);
|
||||||
(void) nvpair_value_int64_array(nvp, &i64p, &nelem);
|
(void) nvpair_value_int64_array(nvp, &i64p, &nelem);
|
||||||
for (i = 0, p = buf; (i < nelem) && (buflen > 0); i++) {
|
for (i = 0, p = buf; (i < nelem) && (buflen > 0); i++) {
|
||||||
n = snprintf(p, buflen, "%lld ", (u_longlong_t) i64p[i]);
|
n = snprintf(p, buflen, "%lld ", (u_longlong_t)i64p[i]);
|
||||||
if ((n < 0) || (n >= buflen))
|
if ((n < 0) || (n >= buflen))
|
||||||
return (_zed_event_add_array_err(eid, name));
|
return (_zed_event_add_array_err(eid, name));
|
||||||
p += n;
|
p += n;
|
||||||
@ -521,7 +521,7 @@ _zed_event_add_uint64_array(uint64_t eid, zed_strings_t *zsp,
|
|||||||
fmt = _zed_event_value_is_hex(name) ? "0x%.16llX " : "%llu ";
|
fmt = _zed_event_value_is_hex(name) ? "0x%.16llX " : "%llu ";
|
||||||
(void) nvpair_value_uint64_array(nvp, &u64p, &nelem);
|
(void) nvpair_value_uint64_array(nvp, &u64p, &nelem);
|
||||||
for (i = 0, p = buf; (i < nelem) && (buflen > 0); i++) {
|
for (i = 0, p = buf; (i < nelem) && (buflen > 0); i++) {
|
||||||
n = snprintf(p, buflen, fmt, (u_longlong_t) u64p[i]);
|
n = snprintf(p, buflen, fmt, (u_longlong_t)u64p[i]);
|
||||||
if ((n < 0) || (n >= buflen))
|
if ((n < 0) || (n >= buflen))
|
||||||
return (_zed_event_add_array_err(eid, name));
|
return (_zed_event_add_array_err(eid, name));
|
||||||
p += n;
|
p += n;
|
||||||
@ -603,7 +603,7 @@ _zed_event_add_nvpair(uint64_t eid, zed_strings_t *zsp, nvpair_t *nvp)
|
|||||||
_zed_event_add_var(eid, zsp, prefix, name, "%d", i8);
|
_zed_event_add_var(eid, zsp, prefix, name, "%d", i8);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_INT8:
|
case DATA_TYPE_INT8:
|
||||||
(void) nvpair_value_int8(nvp, (int8_t *) &i8);
|
(void) nvpair_value_int8(nvp, (int8_t *)&i8);
|
||||||
_zed_event_add_var(eid, zsp, prefix, name, "%d", i8);
|
_zed_event_add_var(eid, zsp, prefix, name, "%d", i8);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_UINT8:
|
case DATA_TYPE_UINT8:
|
||||||
@ -611,7 +611,7 @@ _zed_event_add_nvpair(uint64_t eid, zed_strings_t *zsp, nvpair_t *nvp)
|
|||||||
_zed_event_add_var(eid, zsp, prefix, name, "%u", i8);
|
_zed_event_add_var(eid, zsp, prefix, name, "%u", i8);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_INT16:
|
case DATA_TYPE_INT16:
|
||||||
(void) nvpair_value_int16(nvp, (int16_t *) &i16);
|
(void) nvpair_value_int16(nvp, (int16_t *)&i16);
|
||||||
_zed_event_add_var(eid, zsp, prefix, name, "%d", i16);
|
_zed_event_add_var(eid, zsp, prefix, name, "%d", i16);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_UINT16:
|
case DATA_TYPE_UINT16:
|
||||||
@ -619,7 +619,7 @@ _zed_event_add_nvpair(uint64_t eid, zed_strings_t *zsp, nvpair_t *nvp)
|
|||||||
_zed_event_add_var(eid, zsp, prefix, name, "%u", i16);
|
_zed_event_add_var(eid, zsp, prefix, name, "%u", i16);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_INT32:
|
case DATA_TYPE_INT32:
|
||||||
(void) nvpair_value_int32(nvp, (int32_t *) &i32);
|
(void) nvpair_value_int32(nvp, (int32_t *)&i32);
|
||||||
_zed_event_add_var(eid, zsp, prefix, name, "%d", i32);
|
_zed_event_add_var(eid, zsp, prefix, name, "%d", i32);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_UINT32:
|
case DATA_TYPE_UINT32:
|
||||||
@ -627,15 +627,15 @@ _zed_event_add_nvpair(uint64_t eid, zed_strings_t *zsp, nvpair_t *nvp)
|
|||||||
_zed_event_add_var(eid, zsp, prefix, name, "%u", i32);
|
_zed_event_add_var(eid, zsp, prefix, name, "%u", i32);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_INT64:
|
case DATA_TYPE_INT64:
|
||||||
(void) nvpair_value_int64(nvp, (int64_t *) &i64);
|
(void) nvpair_value_int64(nvp, (int64_t *)&i64);
|
||||||
_zed_event_add_var(eid, zsp, prefix, name,
|
_zed_event_add_var(eid, zsp, prefix, name,
|
||||||
"%lld", (longlong_t) i64);
|
"%lld", (longlong_t)i64);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_UINT64:
|
case DATA_TYPE_UINT64:
|
||||||
(void) nvpair_value_uint64(nvp, &i64);
|
(void) nvpair_value_uint64(nvp, &i64);
|
||||||
_zed_event_add_var(eid, zsp, prefix, name,
|
_zed_event_add_var(eid, zsp, prefix, name,
|
||||||
(_zed_event_value_is_hex(name) ? "0x%.16llX" : "%llu"),
|
(_zed_event_value_is_hex(name) ? "0x%.16llX" : "%llu"),
|
||||||
(u_longlong_t) i64);
|
(u_longlong_t)i64);
|
||||||
/*
|
/*
|
||||||
* shadow readable strings for vdev state pairs
|
* shadow readable strings for vdev state pairs
|
||||||
*/
|
*/
|
||||||
@ -653,9 +653,9 @@ _zed_event_add_nvpair(uint64_t eid, zed_strings_t *zsp, nvpair_t *nvp)
|
|||||||
_zed_event_add_var(eid, zsp, prefix, name, "%g", d);
|
_zed_event_add_var(eid, zsp, prefix, name, "%g", d);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_HRTIME:
|
case DATA_TYPE_HRTIME:
|
||||||
(void) nvpair_value_hrtime(nvp, (hrtime_t *) &i64);
|
(void) nvpair_value_hrtime(nvp, (hrtime_t *)&i64);
|
||||||
_zed_event_add_var(eid, zsp, prefix, name,
|
_zed_event_add_var(eid, zsp, prefix, name,
|
||||||
"%llu", (u_longlong_t) i64);
|
"%llu", (u_longlong_t)i64);
|
||||||
break;
|
break;
|
||||||
case DATA_TYPE_NVLIST:
|
case DATA_TYPE_NVLIST:
|
||||||
_zed_event_add_var(eid, zsp, prefix, name,
|
_zed_event_add_var(eid, zsp, prefix, name,
|
||||||
@ -889,7 +889,7 @@ zed_event_service(struct zed_conf *zcp)
|
|||||||
_zed_event_add_env_preserve(eid, zsp);
|
_zed_event_add_env_preserve(eid, zsp);
|
||||||
|
|
||||||
_zed_event_add_var(eid, zsp, ZED_VAR_PREFIX, "PID",
|
_zed_event_add_var(eid, zsp, ZED_VAR_PREFIX, "PID",
|
||||||
"%d", (int) getpid());
|
"%d", (int)getpid());
|
||||||
_zed_event_add_var(eid, zsp, ZED_VAR_PREFIX, "ZEDLET_DIR",
|
_zed_event_add_var(eid, zsp, ZED_VAR_PREFIX, "ZEDLET_DIR",
|
||||||
"%s", zcp->zedlet_dir);
|
"%s", zcp->zedlet_dir);
|
||||||
subclass = _zed_event_get_subclass(class);
|
subclass = _zed_event_get_subclass(class);
|
||||||
|
@ -54,7 +54,7 @@ _zed_exec_create_env(zed_strings_t *zsp)
|
|||||||
if (!buf)
|
if (!buf)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
|
|
||||||
pp = (char **) buf;
|
pp = (char **)buf;
|
||||||
p = buf + (num_ptrs * sizeof (char *));
|
p = buf + (num_ptrs * sizeof (char *));
|
||||||
i = 0;
|
i = 0;
|
||||||
for (q = zed_strings_first(zsp); q; q = zed_strings_next(zsp)) {
|
for (q = zed_strings_first(zsp); q; q = zed_strings_next(zsp)) {
|
||||||
@ -66,7 +66,7 @@ _zed_exec_create_env(zed_strings_t *zsp)
|
|||||||
}
|
}
|
||||||
pp[i] = NULL;
|
pp[i] = NULL;
|
||||||
assert(buf + buflen == p);
|
assert(buf + buflen == p);
|
||||||
return ((char **) buf);
|
return ((char **)buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -131,7 +131,7 @@ _zed_exec_fork_child(uint64_t eid, const char *dir, const char *prog,
|
|||||||
*/
|
*/
|
||||||
for (n = 0; n < 1000; n++) {
|
for (n = 0; n < 1000; n++) {
|
||||||
wpid = waitpid(pid, &status, WNOHANG);
|
wpid = waitpid(pid, &status, WNOHANG);
|
||||||
if (wpid == (pid_t) -1) {
|
if (wpid == (pid_t)-1) {
|
||||||
if (errno == EINTR)
|
if (errno == EINTR)
|
||||||
continue;
|
continue;
|
||||||
zed_log_msg(LOG_WARNING,
|
zed_log_msg(LOG_WARNING,
|
||||||
|
@ -66,11 +66,11 @@ zed_log_pipe_open(void)
|
|||||||
{
|
{
|
||||||
if ((_ctx.pipe_fd[0] != -1) || (_ctx.pipe_fd[1] != -1))
|
if ((_ctx.pipe_fd[0] != -1) || (_ctx.pipe_fd[1] != -1))
|
||||||
zed_log_die("Invalid use of zed_log_pipe_open in PID %d",
|
zed_log_die("Invalid use of zed_log_pipe_open in PID %d",
|
||||||
(int) getpid());
|
(int)getpid());
|
||||||
|
|
||||||
if (pipe(_ctx.pipe_fd) < 0)
|
if (pipe(_ctx.pipe_fd) < 0)
|
||||||
zed_log_die("Failed to create daemonize pipe in PID %d: %s",
|
zed_log_die("Failed to create daemonize pipe in PID %d: %s",
|
||||||
(int) getpid(), strerror(errno));
|
(int)getpid(), strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -85,12 +85,12 @@ zed_log_pipe_close_reads(void)
|
|||||||
if (_ctx.pipe_fd[0] < 0)
|
if (_ctx.pipe_fd[0] < 0)
|
||||||
zed_log_die(
|
zed_log_die(
|
||||||
"Invalid use of zed_log_pipe_close_reads in PID %d",
|
"Invalid use of zed_log_pipe_close_reads in PID %d",
|
||||||
(int) getpid());
|
(int)getpid());
|
||||||
|
|
||||||
if (close(_ctx.pipe_fd[0]) < 0)
|
if (close(_ctx.pipe_fd[0]) < 0)
|
||||||
zed_log_die(
|
zed_log_die(
|
||||||
"Failed to close reads on daemonize pipe in PID %d: %s",
|
"Failed to close reads on daemonize pipe in PID %d: %s",
|
||||||
(int) getpid(), strerror(errno));
|
(int)getpid(), strerror(errno));
|
||||||
|
|
||||||
_ctx.pipe_fd[0] = -1;
|
_ctx.pipe_fd[0] = -1;
|
||||||
}
|
}
|
||||||
@ -110,12 +110,12 @@ zed_log_pipe_close_writes(void)
|
|||||||
if (_ctx.pipe_fd[1] < 0)
|
if (_ctx.pipe_fd[1] < 0)
|
||||||
zed_log_die(
|
zed_log_die(
|
||||||
"Invalid use of zed_log_pipe_close_writes in PID %d",
|
"Invalid use of zed_log_pipe_close_writes in PID %d",
|
||||||
(int) getpid());
|
(int)getpid());
|
||||||
|
|
||||||
if (close(_ctx.pipe_fd[1]) < 0)
|
if (close(_ctx.pipe_fd[1]) < 0)
|
||||||
zed_log_die(
|
zed_log_die(
|
||||||
"Failed to close writes on daemonize pipe in PID %d: %s",
|
"Failed to close writes on daemonize pipe in PID %d: %s",
|
||||||
(int) getpid(), strerror(errno));
|
(int)getpid(), strerror(errno));
|
||||||
|
|
||||||
_ctx.pipe_fd[1] = -1;
|
_ctx.pipe_fd[1] = -1;
|
||||||
}
|
}
|
||||||
@ -135,7 +135,7 @@ zed_log_pipe_wait(void)
|
|||||||
|
|
||||||
if (_ctx.pipe_fd[0] < 0)
|
if (_ctx.pipe_fd[0] < 0)
|
||||||
zed_log_die("Invalid use of zed_log_pipe_wait in PID %d",
|
zed_log_die("Invalid use of zed_log_pipe_wait in PID %d",
|
||||||
(int) getpid());
|
(int)getpid());
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
n = read(_ctx.pipe_fd[0], &c, sizeof (c));
|
n = read(_ctx.pipe_fd[0], &c, sizeof (c));
|
||||||
@ -144,7 +144,7 @@ zed_log_pipe_wait(void)
|
|||||||
continue;
|
continue;
|
||||||
zed_log_die(
|
zed_log_die(
|
||||||
"Failed to read from daemonize pipe in PID %d: %s",
|
"Failed to read from daemonize pipe in PID %d: %s",
|
||||||
(int) getpid(), strerror(errno));
|
(int)getpid(), strerror(errno));
|
||||||
}
|
}
|
||||||
if (n == 0) {
|
if (n == 0) {
|
||||||
break;
|
break;
|
||||||
|
@ -206,7 +206,7 @@ zed_strings_first(zed_strings_t *zsp)
|
|||||||
if (!zsp->iteratorp)
|
if (!zsp->iteratorp)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
|
|
||||||
return (((zed_strings_node_t *) zsp->iteratorp)->val);
|
return (((zed_strings_node_t *)zsp->iteratorp)->val);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,16 +17,11 @@
|
|||||||
|
|
||||||
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 */
|
||||||
|
@ -2637,7 +2637,7 @@ print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
|
|||||||
case USFIELD_NAME:
|
case USFIELD_NAME:
|
||||||
if (type == DATA_TYPE_UINT64) {
|
if (type == DATA_TYPE_UINT64) {
|
||||||
(void) sprintf(valstr, "%llu",
|
(void) sprintf(valstr, "%llu",
|
||||||
(u_longlong_t) val64);
|
(u_longlong_t)val64);
|
||||||
strval = valstr;
|
strval = valstr;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -2648,7 +2648,7 @@ print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
|
|||||||
if (type == DATA_TYPE_UINT64) {
|
if (type == DATA_TYPE_UINT64) {
|
||||||
if (parsable) {
|
if (parsable) {
|
||||||
(void) sprintf(valstr, "%llu",
|
(void) sprintf(valstr, "%llu",
|
||||||
(u_longlong_t) val64);
|
(u_longlong_t)val64);
|
||||||
} else {
|
} else {
|
||||||
zfs_nicenum(val64, valstr,
|
zfs_nicenum(val64, valstr,
|
||||||
sizeof (valstr));
|
sizeof (valstr));
|
||||||
@ -2672,9 +2672,9 @@ print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
|
|||||||
if (scripted)
|
if (scripted)
|
||||||
(void) printf("%s", strval);
|
(void) printf("%s", strval);
|
||||||
else if (field == USFIELD_TYPE || field == USFIELD_NAME)
|
else if (field == USFIELD_TYPE || field == USFIELD_NAME)
|
||||||
(void) printf("%-*s", (int) width[field], strval);
|
(void) printf("%-*s", (int)width[field], strval);
|
||||||
else
|
else
|
||||||
(void) printf("%*s", (int) width[field], strval);
|
(void) printf("%*s", (int)width[field], strval);
|
||||||
|
|
||||||
first = B_FALSE;
|
first = B_FALSE;
|
||||||
cfield++;
|
cfield++;
|
||||||
@ -2699,10 +2699,10 @@ print_us(boolean_t scripted, boolean_t parsable, int *fields, int types,
|
|||||||
col = gettext(us_field_hdr[field]);
|
col = gettext(us_field_hdr[field]);
|
||||||
if (field == USFIELD_TYPE || field == USFIELD_NAME) {
|
if (field == USFIELD_TYPE || field == USFIELD_NAME) {
|
||||||
(void) printf(first ? "%-*s" : " %-*s",
|
(void) printf(first ? "%-*s" : " %-*s",
|
||||||
(int) width[field], col);
|
(int)width[field], col);
|
||||||
} else {
|
} else {
|
||||||
(void) printf(first ? "%*s" : " %*s",
|
(void) printf(first ? "%*s" : " %*s",
|
||||||
(int) width[field], col);
|
(int)width[field], col);
|
||||||
}
|
}
|
||||||
first = B_FALSE;
|
first = B_FALSE;
|
||||||
cfield++;
|
cfield++;
|
||||||
|
@ -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);
|
||||||
|
@ -143,7 +143,7 @@ regex_match(const char *string, char *pattern)
|
|||||||
return (rc);
|
return (rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = regexec(&re, string, (size_t) 0, NULL, 0);
|
rc = regexec(&re, string, (size_t)0, NULL, 0);
|
||||||
regfree(&re);
|
regfree(&re);
|
||||||
|
|
||||||
return (rc);
|
return (rc);
|
||||||
|
@ -2752,7 +2752,7 @@ print_iostat_labels(iostat_cbdata_t *cb, unsigned int force_column_width,
|
|||||||
rw_column_width = (column_width * columns) +
|
rw_column_width = (column_width * columns) +
|
||||||
(2 * (columns - 1));
|
(2 * (columns - 1));
|
||||||
|
|
||||||
text_start = (int) ((rw_column_width)/columns -
|
text_start = (int)((rw_column_width)/columns -
|
||||||
slen/columns);
|
slen/columns);
|
||||||
|
|
||||||
printf(" "); /* Two spaces between columns */
|
printf(" "); /* Two spaces between columns */
|
||||||
@ -3090,7 +3090,7 @@ print_iostat_histo(struct stat_array *nva, unsigned int len,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cb->cb_scripted)
|
if (cb->cb_scripted)
|
||||||
printf("%llu", (u_longlong_t) val);
|
printf("%llu", (u_longlong_t)val);
|
||||||
else
|
else
|
||||||
printf("%-*s", namewidth, buf);
|
printf("%-*s", namewidth, buf);
|
||||||
|
|
||||||
@ -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);
|
||||||
@ -6173,7 +6173,7 @@ typedef struct upgrade_cbdata {
|
|||||||
static int
|
static int
|
||||||
check_unsupp_fs(zfs_handle_t *zhp, void *unsupp_fs)
|
check_unsupp_fs(zfs_handle_t *zhp, void *unsupp_fs)
|
||||||
{
|
{
|
||||||
int zfs_version = (int) zfs_prop_get_int(zhp, ZFS_PROP_VERSION);
|
int zfs_version = (int)zfs_prop_get_int(zhp, ZFS_PROP_VERSION);
|
||||||
int *count = (int *)unsupp_fs;
|
int *count = (int *)unsupp_fs;
|
||||||
|
|
||||||
if (zfs_version > ZPL_VERSION) {
|
if (zfs_version > ZPL_VERSION) {
|
||||||
@ -6212,7 +6212,7 @@ upgrade_version(zpool_handle_t *zhp, uint64_t version)
|
|||||||
if (unsupp_fs) {
|
if (unsupp_fs) {
|
||||||
(void) fprintf(stderr, gettext("Upgrade not performed due "
|
(void) fprintf(stderr, gettext("Upgrade not performed due "
|
||||||
"to %d unsupported filesystems (max v%d).\n"),
|
"to %d unsupported filesystems (max v%d).\n"),
|
||||||
unsupp_fs, (int) ZPL_VERSION);
|
unsupp_fs, (int)ZPL_VERSION);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6223,12 +6223,12 @@ upgrade_version(zpool_handle_t *zhp, uint64_t version)
|
|||||||
if (version >= SPA_VERSION_FEATURES) {
|
if (version >= SPA_VERSION_FEATURES) {
|
||||||
(void) printf(gettext("Successfully upgraded "
|
(void) printf(gettext("Successfully upgraded "
|
||||||
"'%s' from version %llu to feature flags.\n"),
|
"'%s' from version %llu to feature flags.\n"),
|
||||||
zpool_get_name(zhp), (u_longlong_t) oldversion);
|
zpool_get_name(zhp), (u_longlong_t)oldversion);
|
||||||
} else {
|
} else {
|
||||||
(void) printf(gettext("Successfully upgraded "
|
(void) printf(gettext("Successfully upgraded "
|
||||||
"'%s' from version %llu to version %llu.\n"),
|
"'%s' from version %llu to version %llu.\n"),
|
||||||
zpool_get_name(zhp), (u_longlong_t) oldversion,
|
zpool_get_name(zhp), (u_longlong_t)oldversion,
|
||||||
(u_longlong_t) version);
|
(u_longlong_t)version);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
@ -6435,14 +6435,14 @@ upgrade_one(zpool_handle_t *zhp, void *data)
|
|||||||
if (cur_version > cbp->cb_version) {
|
if (cur_version > cbp->cb_version) {
|
||||||
(void) printf(gettext("Pool '%s' is already formatted "
|
(void) printf(gettext("Pool '%s' is already formatted "
|
||||||
"using more current version '%llu'.\n\n"),
|
"using more current version '%llu'.\n\n"),
|
||||||
zpool_get_name(zhp), (u_longlong_t) cur_version);
|
zpool_get_name(zhp), (u_longlong_t)cur_version);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cbp->cb_version != SPA_VERSION && cur_version == cbp->cb_version) {
|
if (cbp->cb_version != SPA_VERSION && cur_version == cbp->cb_version) {
|
||||||
(void) printf(gettext("Pool '%s' is already formatted "
|
(void) printf(gettext("Pool '%s' is already formatted "
|
||||||
"using version %llu.\n\n"), zpool_get_name(zhp),
|
"using version %llu.\n\n"), zpool_get_name(zhp),
|
||||||
(u_longlong_t) cbp->cb_version);
|
(u_longlong_t)cbp->cb_version);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6629,7 +6629,7 @@ zpool_do_upgrade(int argc, char **argv)
|
|||||||
} else {
|
} else {
|
||||||
(void) printf(gettext("All pools are already "
|
(void) printf(gettext("All pools are already "
|
||||||
"formatted with version %llu or higher.\n"),
|
"formatted with version %llu or higher.\n"),
|
||||||
(u_longlong_t) cb.cb_version);
|
(u_longlong_t)cb.cb_version);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (argc == 0) {
|
} else if (argc == 0) {
|
||||||
@ -6720,14 +6720,14 @@ get_history_one(zpool_handle_t *zhp, void *data)
|
|||||||
}
|
}
|
||||||
(void) printf("%s [internal %s txg:%lld] %s", tbuf,
|
(void) printf("%s [internal %s txg:%lld] %s", tbuf,
|
||||||
zfs_history_event_names[ievent],
|
zfs_history_event_names[ievent],
|
||||||
(longlong_t) fnvlist_lookup_uint64(
|
(longlong_t)fnvlist_lookup_uint64(
|
||||||
rec, ZPOOL_HIST_TXG),
|
rec, ZPOOL_HIST_TXG),
|
||||||
fnvlist_lookup_string(rec, ZPOOL_HIST_INT_STR));
|
fnvlist_lookup_string(rec, ZPOOL_HIST_INT_STR));
|
||||||
} else if (nvlist_exists(rec, ZPOOL_HIST_INT_NAME)) {
|
} else if (nvlist_exists(rec, ZPOOL_HIST_INT_NAME)) {
|
||||||
if (!cb->internal)
|
if (!cb->internal)
|
||||||
continue;
|
continue;
|
||||||
(void) printf("%s [txg:%lld] %s", tbuf,
|
(void) printf("%s [txg:%lld] %s", tbuf,
|
||||||
(longlong_t) fnvlist_lookup_uint64(
|
(longlong_t)fnvlist_lookup_uint64(
|
||||||
rec, ZPOOL_HIST_TXG),
|
rec, ZPOOL_HIST_TXG),
|
||||||
fnvlist_lookup_string(rec, ZPOOL_HIST_INT_NAME));
|
fnvlist_lookup_string(rec, ZPOOL_HIST_INT_NAME));
|
||||||
if (nvlist_exists(rec, ZPOOL_HIST_DSNAME)) {
|
if (nvlist_exists(rec, ZPOOL_HIST_DSNAME)) {
|
||||||
|
@ -89,7 +89,7 @@ typedef struct vdev_cmd_data_list
|
|||||||
vdev_cmd_data_t *data; /* Array of vdevs */
|
vdev_cmd_data_t *data; /* Array of vdevs */
|
||||||
} vdev_cmd_data_list_t;
|
} vdev_cmd_data_list_t;
|
||||||
|
|
||||||
vdev_cmd_data_list_t * all_pools_for_each_vdev_run(int argc, char **argv,
|
vdev_cmd_data_list_t *all_pools_for_each_vdev_run(int argc, char **argv,
|
||||||
char *cmd);
|
char *cmd);
|
||||||
void free_vdev_cmd_data_list(vdev_cmd_data_list_t *vcdl);
|
void free_vdev_cmd_data_list(vdev_cmd_data_list_t *vcdl);
|
||||||
|
|
||||||
|
@ -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);
|
||||||
|
@ -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, \
|
||||||
|
@ -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, \
|
||||||
|
@ -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) \
|
||||||
|
@ -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, \
|
||||||
|
@ -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, \
|
||||||
|
@ -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, \
|
||||||
|
@ -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, \
|
||||||
|
@ -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, \
|
||||||
|
@ -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 */
|
||||||
|
|
||||||
|
@ -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, \
|
||||||
|
@ -40,7 +40,7 @@ struct kernel_param {};
|
|||||||
/*
|
/*
|
||||||
* vdev_raidz interface
|
* vdev_raidz interface
|
||||||
*/
|
*/
|
||||||
struct raidz_map * vdev_raidz_map_alloc(struct zio *, uint64_t, uint64_t,
|
struct raidz_map *vdev_raidz_map_alloc(struct zio *, uint64_t, uint64_t,
|
||||||
uint64_t);
|
uint64_t);
|
||||||
void vdev_raidz_map_free(struct raidz_map *);
|
void vdev_raidz_map_free(struct raidz_map *);
|
||||||
void vdev_raidz_generate_parity(struct raidz_map *);
|
void vdev_raidz_generate_parity(struct raidz_map *);
|
||||||
@ -51,10 +51,10 @@ int vdev_raidz_reconstruct(struct raidz_map *, const int *, int);
|
|||||||
*/
|
*/
|
||||||
void vdev_raidz_math_init(void);
|
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
|
||||||
|
@ -182,7 +182,7 @@ extern const raidz_impl_ops_t vdev_raidz_aarch64_neonx2_impl;
|
|||||||
static void \
|
static void \
|
||||||
impl ## _gen_ ## code(void *rmp) \
|
impl ## _gen_ ## code(void *rmp) \
|
||||||
{ \
|
{ \
|
||||||
raidz_map_t *rm = (raidz_map_t *) rmp; \
|
raidz_map_t *rm = (raidz_map_t *)rmp; \
|
||||||
raidz_generate_## code ## _impl(rm); \
|
raidz_generate_## code ## _impl(rm); \
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -196,7 +196,7 @@ impl ## _gen_ ## code(void *rmp) \
|
|||||||
static int \
|
static int \
|
||||||
impl ## _rec_ ## code(void *rmp, const int *tgtidx) \
|
impl ## _rec_ ## code(void *rmp, const int *tgtidx) \
|
||||||
{ \
|
{ \
|
||||||
raidz_map_t *rm = (raidz_map_t *) rmp; \
|
raidz_map_t *rm = (raidz_map_t *)rmp; \
|
||||||
return (raidz_reconstruct_## code ## _impl(rm, tgtidx)); \
|
return (raidz_reconstruct_## code ## _impl(rm, tgtidx)); \
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -295,7 +295,7 @@ vdev_raidz_exp2(const uint8_t a, const unsigned exp)
|
|||||||
if (a == 0)
|
if (a == 0)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
return (vdev_raidz_pow2[(exp + (unsigned) vdev_raidz_log2[a]) % 255]);
|
return (vdev_raidz_pow2[(exp + (unsigned)vdev_raidz_log2[a]) % 255]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -318,9 +318,9 @@ gf_mul(const gf_t a, const gf_t b)
|
|||||||
if (a == 0 || b == 0)
|
if (a == 0 || b == 0)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
logsum = (gf_log_t) vdev_raidz_log2[a] + (gf_log_t) vdev_raidz_log2[b];
|
logsum = (gf_log_t)vdev_raidz_log2[a] + (gf_log_t)vdev_raidz_log2[b];
|
||||||
|
|
||||||
return ((gf_t) vdev_raidz_pow2[logsum % 255]);
|
return ((gf_t)vdev_raidz_pow2[logsum % 255]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline gf_t
|
static inline gf_t
|
||||||
@ -332,10 +332,10 @@ gf_div(const gf_t a, const gf_t b)
|
|||||||
if (a == 0)
|
if (a == 0)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
logsum = (gf_log_t) 255 + (gf_log_t) vdev_raidz_log2[a] -
|
logsum = (gf_log_t)255 + (gf_log_t)vdev_raidz_log2[a] -
|
||||||
(gf_log_t) vdev_raidz_log2[b];
|
(gf_log_t)vdev_raidz_log2[b];
|
||||||
|
|
||||||
return ((gf_t) vdev_raidz_pow2[logsum % 255]);
|
return ((gf_t)vdev_raidz_pow2[logsum % 255]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline gf_t
|
static inline gf_t
|
||||||
@ -345,9 +345,9 @@ gf_inv(const gf_t a)
|
|||||||
|
|
||||||
ASSERT3U(a, >, 0);
|
ASSERT3U(a, >, 0);
|
||||||
|
|
||||||
logsum = (gf_log_t) 255 - (gf_log_t) vdev_raidz_log2[a];
|
logsum = (gf_log_t)255 - (gf_log_t)vdev_raidz_log2[a];
|
||||||
|
|
||||||
return ((gf_t) vdev_raidz_pow2[logsum]);
|
return ((gf_t)vdev_raidz_pow2[logsum]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline gf_t
|
static inline gf_t
|
||||||
@ -360,7 +360,7 @@ static inline gf_t
|
|||||||
gf_exp4(gf_log_t exp)
|
gf_exp4(gf_log_t exp)
|
||||||
{
|
{
|
||||||
ASSERT3U(exp, <=, 255);
|
ASSERT3U(exp, <=, 255);
|
||||||
return ((gf_t) vdev_raidz_pow2[(2 * exp) % 255]);
|
return ((gf_t)vdev_raidz_pow2[(2 * exp) % 255]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -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
|
||||||
|
@ -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);
|
||||||
|
@ -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)
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
@ -86,7 +86,7 @@ getextmntent(FILE *fp, struct extmnttab *mp, int len)
|
|||||||
int ret;
|
int ret;
|
||||||
struct stat64 st;
|
struct stat64 st;
|
||||||
|
|
||||||
ret = _sol_getmntent(fp, (struct mnttab *) mp);
|
ret = _sol_getmntent(fp, (struct mnttab *)mp);
|
||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
if (stat64(mp->mnt_mountp, &st) != 0) {
|
if (stat64(mp->mnt_mountp, &st) != 0) {
|
||||||
mp->mnt_major = 0;
|
mp->mnt_major = 0;
|
||||||
|
@ -2343,7 +2343,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,
|
|||||||
strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
|
strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
|
||||||
&t) == 0)
|
&t) == 0)
|
||||||
(void) snprintf(propbuf, proplen, "%llu",
|
(void) snprintf(propbuf, proplen, "%llu",
|
||||||
(u_longlong_t) val);
|
(u_longlong_t)val);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -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';
|
||||||
}
|
}
|
||||||
@ -4210,7 +4210,7 @@ zpool_label_name(char *label_name, int label_size)
|
|||||||
if (id == 0)
|
if (id == 0)
|
||||||
id = (((uint64_t)rand()) << 32) | (uint64_t)rand();
|
id = (((uint64_t)rand()) << 32) | (uint64_t)rand();
|
||||||
|
|
||||||
snprintf(label_name, label_size, "zfs-%016llx", (u_longlong_t) id);
|
snprintf(label_name, label_size, "zfs-%016llx", (u_longlong_t)id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -2615,7 +2615,7 @@ again:
|
|||||||
else
|
else
|
||||||
progress = B_TRUE;
|
progress = B_TRUE;
|
||||||
sprintf(guidname, "%llu",
|
sprintf(guidname, "%llu",
|
||||||
(u_longlong_t) parent_fromsnap_guid);
|
(u_longlong_t)parent_fromsnap_guid);
|
||||||
nvlist_add_boolean(deleted, guidname);
|
nvlist_add_boolean(deleted, guidname);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -2649,7 +2649,7 @@ again:
|
|||||||
parent_fromsnap_guid != 0 &&
|
parent_fromsnap_guid != 0 &&
|
||||||
stream_parent_fromsnap_guid != parent_fromsnap_guid) {
|
stream_parent_fromsnap_guid != parent_fromsnap_guid) {
|
||||||
sprintf(guidname, "%llu",
|
sprintf(guidname, "%llu",
|
||||||
(u_longlong_t) parent_fromsnap_guid);
|
(u_longlong_t)parent_fromsnap_guid);
|
||||||
if (nvlist_exists(deleted, guidname)) {
|
if (nvlist_exists(deleted, guidname)) {
|
||||||
progress = B_TRUE;
|
progress = B_TRUE;
|
||||||
needagain = B_TRUE;
|
needagain = B_TRUE;
|
||||||
|
@ -617,7 +617,7 @@ zfs_nicenum_format(uint64_t num, char *buf, size_t buflen,
|
|||||||
double val;
|
double val;
|
||||||
|
|
||||||
if (format == ZFS_NICENUM_RAW) {
|
if (format == ZFS_NICENUM_RAW) {
|
||||||
snprintf(buf, buflen, "%llu", (u_longlong_t) num);
|
snprintf(buf, buflen, "%llu", (u_longlong_t)num);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -633,12 +633,12 @@ zfs_nicenum_format(uint64_t num, char *buf, size_t buflen,
|
|||||||
if ((format == ZFS_NICENUM_TIME) && (num == 0)) {
|
if ((format == ZFS_NICENUM_TIME) && (num == 0)) {
|
||||||
(void) snprintf(buf, buflen, "-");
|
(void) snprintf(buf, buflen, "-");
|
||||||
} else if ((index == 0) || ((num %
|
} else if ((index == 0) || ((num %
|
||||||
(uint64_t) powl(k_unit[format], index)) == 0)) {
|
(uint64_t)powl(k_unit[format], index)) == 0)) {
|
||||||
/*
|
/*
|
||||||
* If this is an even multiple of the base, always display
|
* If this is an even multiple of the base, always display
|
||||||
* without any decimal precision.
|
* without any decimal precision.
|
||||||
*/
|
*/
|
||||||
(void) snprintf(buf, buflen, "%llu%s", (u_longlong_t) n, u);
|
(void) snprintf(buf, buflen, "%llu%s", (u_longlong_t)n, u);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
@ -652,8 +652,8 @@ zfs_nicenum_format(uint64_t num, char *buf, size_t buflen,
|
|||||||
*/
|
*/
|
||||||
int i;
|
int i;
|
||||||
for (i = 2; i >= 0; i--) {
|
for (i = 2; i >= 0; i--) {
|
||||||
val = (double) num /
|
val = (double)num /
|
||||||
(uint64_t) powl(k_unit[format], index);
|
(uint64_t)powl(k_unit[format], index);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Don't print floating point values for time. Note,
|
* Don't print floating point values for time. Note,
|
||||||
@ -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);
|
||||||
|
|
||||||
|
@ -617,7 +617,7 @@ recv_impl(const char *snapname, nvlist_t *props, const char *origin,
|
|||||||
fnvlist_add_string(innvl, "origin", origin);
|
fnvlist_add_string(innvl, "origin", origin);
|
||||||
|
|
||||||
fnvlist_add_byte_array(innvl, "begin_record",
|
fnvlist_add_byte_array(innvl, "begin_record",
|
||||||
(uchar_t *) &drr, sizeof (drr));
|
(uchar_t *)&drr, sizeof (drr));
|
||||||
|
|
||||||
fnvlist_add_int32(innvl, "input_fd", input_fd);
|
fnvlist_add_int32(innvl, "input_fd", input_fd);
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ zk_thread_current(void)
|
|||||||
void *
|
void *
|
||||||
zk_thread_helper(void *arg)
|
zk_thread_helper(void *arg)
|
||||||
{
|
{
|
||||||
kthread_t *kt = (kthread_t *) arg;
|
kthread_t *kt = (kthread_t *)arg;
|
||||||
|
|
||||||
VERIFY3S(pthread_setspecific(kthread_key, kt), ==, 0);
|
VERIFY3S(pthread_setspecific(kthread_key, kt), ==, 0);
|
||||||
|
|
||||||
@ -137,7 +137,7 @@ zk_thread_helper(void *arg)
|
|||||||
(void) setpriority(PRIO_PROCESS, 0, kt->t_pri);
|
(void) setpriority(PRIO_PROCESS, 0, kt->t_pri);
|
||||||
|
|
||||||
kt->t_tid = pthread_self();
|
kt->t_tid = pthread_self();
|
||||||
((thread_func_arg_t) kt->t_func)(kt->t_arg);
|
((thread_func_arg_t)kt->t_func)(kt->t_arg);
|
||||||
|
|
||||||
/* Unreachable, thread must exit with thread_exit() */
|
/* Unreachable, thread must exit with thread_exit() */
|
||||||
abort();
|
abort();
|
||||||
@ -916,7 +916,7 @@ __dprintf(const char *file, const char *func, int line, const char *fmt, ...)
|
|||||||
if (dprintf_find_string("pid"))
|
if (dprintf_find_string("pid"))
|
||||||
(void) printf("%d ", getpid());
|
(void) printf("%d ", getpid());
|
||||||
if (dprintf_find_string("tid"))
|
if (dprintf_find_string("tid"))
|
||||||
(void) printf("%u ", (uint_t) pthread_self());
|
(void) printf("%u ", (uint_t)pthread_self());
|
||||||
if (dprintf_find_string("cpu"))
|
if (dprintf_find_string("cpu"))
|
||||||
(void) printf("%u ", getcpuid());
|
(void) printf("%u ", getcpuid());
|
||||||
if (dprintf_find_string("time"))
|
if (dprintf_find_string("time"))
|
||||||
@ -1490,7 +1490,7 @@ zfs_onexit_cb_data(minor_t minor, uint64_t action_handle, void **data)
|
|||||||
fstrans_cookie_t
|
fstrans_cookie_t
|
||||||
spl_fstrans_mark(void)
|
spl_fstrans_mark(void)
|
||||||
{
|
{
|
||||||
return ((fstrans_cookie_t) 0);
|
return ((fstrans_cookie_t)0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1593,10 +1593,9 @@ intel_aes_instructions_present(void)
|
|||||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||||
: "a"(func), "c"(subfunc));
|
: "a"(func), "c"(subfunc));
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
@ -723,10 +723,9 @@ intel_pclmulqdq_instruction_present(void)
|
|||||||
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
|
||||||
: "a"(func), "c"(subfunc));
|
: "a"(func), "c"(subfunc));
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
@ -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 *));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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 -
|
||||||
|
@ -608,7 +608,7 @@ fletcher_4_kstat_data(char *buf, size_t size, void *data)
|
|||||||
{
|
{
|
||||||
struct fletcher_4_kstat *fastest_stat =
|
struct fletcher_4_kstat *fastest_stat =
|
||||||
&fletcher_4_stat_data[fletcher_4_supp_impls_cnt];
|
&fletcher_4_stat_data[fletcher_4_supp_impls_cnt];
|
||||||
struct fletcher_4_kstat *curr_stat = (struct fletcher_4_kstat *) data;
|
struct fletcher_4_kstat *curr_stat = (struct fletcher_4_kstat *)data;
|
||||||
ssize_t off = 0;
|
ssize_t off = 0;
|
||||||
|
|
||||||
if (curr_stat == fastest_stat) {
|
if (curr_stat == fastest_stat) {
|
||||||
@ -623,9 +623,9 @@ fletcher_4_kstat_data(char *buf, size_t size, void *data)
|
|||||||
off += snprintf(buf + off, size - off, "%-17s",
|
off += snprintf(buf + off, size - off, "%-17s",
|
||||||
fletcher_4_supp_impls[id]->name);
|
fletcher_4_supp_impls[id]->name);
|
||||||
off += snprintf(buf + off, size - off, "%-15llu",
|
off += snprintf(buf + off, size - off, "%-15llu",
|
||||||
(u_longlong_t) curr_stat->native);
|
(u_longlong_t)curr_stat->native);
|
||||||
off += snprintf(buf + off, size - off, "%-15llu\n",
|
off += snprintf(buf + off, size - off, "%-15llu\n",
|
||||||
(u_longlong_t) curr_stat->byteswap);
|
(u_longlong_t)curr_stat->byteswap);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
@ -723,7 +723,7 @@ fletcher_4_init(void)
|
|||||||
|
|
||||||
/* move supported impl into fletcher_4_supp_impls */
|
/* move supported impl into fletcher_4_supp_impls */
|
||||||
for (i = 0, c = 0; i < ARRAY_SIZE(fletcher_4_impls); i++) {
|
for (i = 0, c = 0; i < ARRAY_SIZE(fletcher_4_impls); i++) {
|
||||||
curr_impl = (fletcher_4_ops_t *) fletcher_4_impls[i];
|
curr_impl = (fletcher_4_ops_t *)fletcher_4_impls[i];
|
||||||
|
|
||||||
if (curr_impl->valid && curr_impl->valid())
|
if (curr_impl->valid && curr_impl->valid())
|
||||||
fletcher_4_supp_impls[c++] = curr_impl;
|
fletcher_4_supp_impls[c++] = curr_impl;
|
||||||
|
@ -193,7 +193,7 @@ uio_prefaultpages(ssize_t n, struct uio *uio)
|
|||||||
*/
|
*/
|
||||||
p = iov->iov_base + skip;
|
p = iov->iov_base + skip;
|
||||||
while (cnt) {
|
while (cnt) {
|
||||||
if (fuword8((uint8_t *) p, &tmp))
|
if (fuword8((uint8_t *)p, &tmp))
|
||||||
return;
|
return;
|
||||||
incr = MIN(cnt, PAGESIZE);
|
incr = MIN(cnt, PAGESIZE);
|
||||||
p += incr;
|
p += incr;
|
||||||
@ -203,7 +203,7 @@ uio_prefaultpages(ssize_t n, struct uio *uio)
|
|||||||
* touch the last byte in case it straddles a page.
|
* touch the last byte in case it straddles a page.
|
||||||
*/
|
*/
|
||||||
p--;
|
p--;
|
||||||
if (fuword8((uint8_t *) p, &tmp))
|
if (fuword8((uint8_t *)p, &tmp))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -407,7 +407,7 @@ struct page;
|
|||||||
|
|
||||||
#define kpm_enable 1
|
#define kpm_enable 1
|
||||||
#define abd_alloc_chunk(o) \
|
#define abd_alloc_chunk(o) \
|
||||||
((struct page *) umem_alloc_aligned(PAGESIZE << (o), 64, KM_SLEEP))
|
((struct page *)umem_alloc_aligned(PAGESIZE << (o), 64, KM_SLEEP))
|
||||||
#define abd_free_chunk(chunk, o) umem_free(chunk, PAGESIZE << (o))
|
#define abd_free_chunk(chunk, o) umem_free(chunk, PAGESIZE << (o))
|
||||||
#define zfs_kmap_atomic(chunk, km) ((void *)chunk)
|
#define zfs_kmap_atomic(chunk, km) ((void *)chunk)
|
||||||
#define zfs_kunmap_atomic(addr, km) do { (void)(addr); } while (0)
|
#define zfs_kunmap_atomic(addr, km) do { (void)(addr); } while (0)
|
||||||
@ -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.");
|
||||||
|
@ -1510,7 +1510,7 @@ arc_cksum_compute(arc_buf_t *buf)
|
|||||||
void
|
void
|
||||||
arc_buf_sigsegv(int sig, siginfo_t *si, void *unused)
|
arc_buf_sigsegv(int sig, siginfo_t *si, void *unused)
|
||||||
{
|
{
|
||||||
panic("Got SIGSEGV at address: 0x%lx\n", (long) si->si_addr);
|
panic("Got SIGSEGV at address: 0x%lx\n", (long)si->si_addr);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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");
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ gzip_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
|
|||||||
return (s_len);
|
return (s_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ((size_t) dstlen);
|
return ((size_t)dstlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*ARGSUSED*/
|
/*ARGSUSED*/
|
||||||
|
@ -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 */
|
||||||
|
@ -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");
|
||||||
|
@ -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
|
||||||
|
@ -124,10 +124,10 @@ vdev_raidz_math_get_ops()
|
|||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case IMPL_ORIGINAL:
|
case IMPL_ORIGINAL:
|
||||||
ops = (raidz_impl_ops_t *) &vdev_raidz_original_impl;
|
ops = (raidz_impl_ops_t *)&vdev_raidz_original_impl;
|
||||||
break;
|
break;
|
||||||
case IMPL_SCALAR:
|
case IMPL_SCALAR:
|
||||||
ops = (raidz_impl_ops_t *) &vdev_raidz_scalar_impl;
|
ops = (raidz_impl_ops_t *)&vdev_raidz_scalar_impl;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ASSERT3U(impl, <, raidz_supp_impl_cnt);
|
ASSERT3U(impl, <, raidz_supp_impl_cnt);
|
||||||
@ -300,8 +300,8 @@ raidz_math_kstat_headers(char *buf, size_t size)
|
|||||||
static int
|
static int
|
||||||
raidz_math_kstat_data(char *buf, size_t size, void *data)
|
raidz_math_kstat_data(char *buf, size_t size, void *data)
|
||||||
{
|
{
|
||||||
raidz_impl_kstat_t * fstat = &raidz_impl_kstats[raidz_supp_impl_cnt];
|
raidz_impl_kstat_t *fstat = &raidz_impl_kstats[raidz_supp_impl_cnt];
|
||||||
raidz_impl_kstat_t * cstat = (raidz_impl_kstat_t *) data;
|
raidz_impl_kstat_t *cstat = (raidz_impl_kstat_t *)data;
|
||||||
ssize_t off = 0;
|
ssize_t off = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@ -328,11 +328,11 @@ raidz_math_kstat_data(char *buf, size_t size, void *data)
|
|||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(raidz_gen_name); i++)
|
for (i = 0; i < ARRAY_SIZE(raidz_gen_name); i++)
|
||||||
off += snprintf(buf + off, size - off, "%-16llu",
|
off += snprintf(buf + off, size - off, "%-16llu",
|
||||||
(u_longlong_t) cstat->gen[i]);
|
(u_longlong_t)cstat->gen[i]);
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(raidz_rec_name); i++)
|
for (i = 0; i < ARRAY_SIZE(raidz_rec_name); i++)
|
||||||
off += snprintf(buf + off, size - off, "%-16llu",
|
off += snprintf(buf + off, size - off, "%-16llu",
|
||||||
(u_longlong_t) cstat->rec[i]);
|
(u_longlong_t)cstat->rec[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
(void) snprintf(buf + off, size - off, "\n");
|
(void) snprintf(buf + off, size - off, "\n");
|
||||||
@ -392,7 +392,7 @@ benchmark_raidz_impl(raidz_map_t *bench_rm, const int fn, benchmark_fn bench_fn)
|
|||||||
uint64_t run_cnt, speed, best_speed = 0;
|
uint64_t run_cnt, speed, best_speed = 0;
|
||||||
hrtime_t t_start, t_diff;
|
hrtime_t t_start, t_diff;
|
||||||
raidz_impl_ops_t *curr_impl;
|
raidz_impl_ops_t *curr_impl;
|
||||||
raidz_impl_kstat_t * fstat = &raidz_impl_kstats[raidz_supp_impl_cnt];
|
raidz_impl_kstat_t *fstat = &raidz_impl_kstats[raidz_supp_impl_cnt];
|
||||||
int impl, i;
|
int impl, i;
|
||||||
|
|
||||||
for (impl = 0; impl < raidz_supp_impl_cnt; impl++) {
|
for (impl = 0; impl < raidz_supp_impl_cnt; impl++) {
|
||||||
@ -446,14 +446,14 @@ vdev_raidz_math_init(void)
|
|||||||
|
|
||||||
/* move supported impl into raidz_supp_impl */
|
/* move supported impl into raidz_supp_impl */
|
||||||
for (i = 0, c = 0; i < ARRAY_SIZE(raidz_all_maths); i++) {
|
for (i = 0, c = 0; i < ARRAY_SIZE(raidz_all_maths); i++) {
|
||||||
curr_impl = (raidz_impl_ops_t *) raidz_all_maths[i];
|
curr_impl = (raidz_impl_ops_t *)raidz_all_maths[i];
|
||||||
|
|
||||||
/* initialize impl */
|
/* initialize impl */
|
||||||
if (curr_impl->init)
|
if (curr_impl->init)
|
||||||
curr_impl->init();
|
curr_impl->init();
|
||||||
|
|
||||||
if (curr_impl->is_supported())
|
if (curr_impl->is_supported())
|
||||||
raidz_supp_impl[c++] = (raidz_impl_ops_t *) curr_impl;
|
raidz_supp_impl[c++] = (raidz_impl_ops_t *)curr_impl;
|
||||||
}
|
}
|
||||||
membar_producer(); /* complete raidz_supp_impl[] init */
|
membar_producer(); /* complete raidz_supp_impl[] init */
|
||||||
raidz_supp_impl_cnt = c; /* number of supported impl */
|
raidz_supp_impl_cnt = c; /* number of supported impl */
|
||||||
|
@ -158,7 +158,7 @@ raidz_rec_pqr_coeff(const raidz_map_t *rm, const int *tgtidx, unsigned *coeff)
|
|||||||
static int
|
static int
|
||||||
raidz_zero_abd_cb(void *dc, size_t dsize, void *private)
|
raidz_zero_abd_cb(void *dc, size_t dsize, void *private)
|
||||||
{
|
{
|
||||||
v_t *dst = (v_t *) dc;
|
v_t *dst = (v_t *)dc;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
ZERO_DEFINE();
|
ZERO_DEFINE();
|
||||||
@ -193,8 +193,8 @@ raidz_zero_abd_cb(void *dc, size_t dsize, void *private)
|
|||||||
static int
|
static int
|
||||||
raidz_copy_abd_cb(void *dc, void *sc, size_t size, void *private)
|
raidz_copy_abd_cb(void *dc, void *sc, size_t size, void *private)
|
||||||
{
|
{
|
||||||
v_t *dst = (v_t *) dc;
|
v_t *dst = (v_t *)dc;
|
||||||
const v_t *src = (v_t *) sc;
|
const v_t *src = (v_t *)sc;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
COPY_DEFINE();
|
COPY_DEFINE();
|
||||||
@ -232,8 +232,8 @@ raidz_copy_abd_cb(void *dc, void *sc, size_t size, void *private)
|
|||||||
static int
|
static int
|
||||||
raidz_add_abd_cb(void *dc, void *sc, size_t size, void *private)
|
raidz_add_abd_cb(void *dc, void *sc, size_t size, void *private)
|
||||||
{
|
{
|
||||||
v_t *dst = (v_t *) dc;
|
v_t *dst = (v_t *)dc;
|
||||||
const v_t *src = (v_t *) sc;
|
const v_t *src = (v_t *)sc;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
ADD_DEFINE();
|
ADD_DEFINE();
|
||||||
@ -270,8 +270,8 @@ raidz_add_abd_cb(void *dc, void *sc, size_t size, void *private)
|
|||||||
static int
|
static int
|
||||||
raidz_mul_abd_cb(void *dc, size_t size, void *private)
|
raidz_mul_abd_cb(void *dc, size_t size, void *private)
|
||||||
{
|
{
|
||||||
const unsigned mul = *((unsigned *) private);
|
const unsigned mul = *((unsigned *)private);
|
||||||
v_t *d = (v_t *) dc;
|
v_t *d = (v_t *)dc;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
MUL_DEFINE();
|
MUL_DEFINE();
|
||||||
@ -389,9 +389,9 @@ static void
|
|||||||
raidz_gen_pq_add(void **c, const void *dc, const size_t csize,
|
raidz_gen_pq_add(void **c, const void *dc, const size_t csize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *p = (v_t *) c[0];
|
v_t *p = (v_t *)c[0];
|
||||||
v_t *q = (v_t *) c[1];
|
v_t *q = (v_t *)c[1];
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
const v_t * const qend = q + (csize / sizeof (v_t));
|
const v_t * const qend = q + (csize / sizeof (v_t));
|
||||||
|
|
||||||
@ -459,10 +459,10 @@ static void
|
|||||||
raidz_gen_pqr_add(void **c, const void *dc, const size_t csize,
|
raidz_gen_pqr_add(void **c, const void *dc, const size_t csize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *p = (v_t *) c[0];
|
v_t *p = (v_t *)c[0];
|
||||||
v_t *q = (v_t *) c[1];
|
v_t *q = (v_t *)c[1];
|
||||||
v_t *r = (v_t *) c[CODE_R];
|
v_t *r = (v_t *)c[CODE_R];
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
const v_t * const qend = q + (csize / sizeof (v_t));
|
const v_t * const qend = q + (csize / sizeof (v_t));
|
||||||
|
|
||||||
@ -628,8 +628,8 @@ static void
|
|||||||
raidz_syn_q_abd(void **xc, const void *dc, const size_t xsize,
|
raidz_syn_q_abd(void **xc, const void *dc, const size_t xsize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) xc[TARGET_X];
|
v_t *x = (v_t *)xc[TARGET_X];
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
const v_t * const xend = x + (xsize / sizeof (v_t));
|
const v_t * const xend = x + (xsize / sizeof (v_t));
|
||||||
|
|
||||||
@ -719,8 +719,8 @@ static void
|
|||||||
raidz_syn_r_abd(void **xc, const void *dc, const size_t tsize,
|
raidz_syn_r_abd(void **xc, const void *dc, const size_t tsize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) xc[TARGET_X];
|
v_t *x = (v_t *)xc[TARGET_X];
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
const v_t * const xend = x + (tsize / sizeof (v_t));
|
const v_t * const xend = x + (tsize / sizeof (v_t));
|
||||||
|
|
||||||
@ -811,9 +811,9 @@ static void
|
|||||||
raidz_syn_pq_abd(void **tc, const void *dc, const size_t tsize,
|
raidz_syn_pq_abd(void **tc, const void *dc, const size_t tsize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) tc[TARGET_X];
|
v_t *x = (v_t *)tc[TARGET_X];
|
||||||
v_t *y = (v_t *) tc[TARGET_Y];
|
v_t *y = (v_t *)tc[TARGET_Y];
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
const v_t * const yend = y + (tsize / sizeof (v_t));
|
const v_t * const yend = y + (tsize / sizeof (v_t));
|
||||||
|
|
||||||
@ -843,11 +843,11 @@ static void
|
|||||||
raidz_rec_pq_abd(void **tc, const size_t tsize, void **c,
|
raidz_rec_pq_abd(void **tc, const size_t tsize, void **c,
|
||||||
const unsigned *mul)
|
const unsigned *mul)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) tc[TARGET_X];
|
v_t *x = (v_t *)tc[TARGET_X];
|
||||||
v_t *y = (v_t *) tc[TARGET_Y];
|
v_t *y = (v_t *)tc[TARGET_Y];
|
||||||
const v_t * const xend = x + (tsize / sizeof (v_t));
|
const v_t * const xend = x + (tsize / sizeof (v_t));
|
||||||
const v_t *p = (v_t *) c[CODE_P];
|
const v_t *p = (v_t *)c[CODE_P];
|
||||||
const v_t *q = (v_t *) c[CODE_Q];
|
const v_t *q = (v_t *)c[CODE_Q];
|
||||||
|
|
||||||
REC_PQ_DEFINE();
|
REC_PQ_DEFINE();
|
||||||
|
|
||||||
@ -969,9 +969,9 @@ static void
|
|||||||
raidz_syn_pr_abd(void **c, const void *dc, const size_t tsize,
|
raidz_syn_pr_abd(void **c, const void *dc, const size_t tsize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) c[TARGET_X];
|
v_t *x = (v_t *)c[TARGET_X];
|
||||||
v_t *y = (v_t *) c[TARGET_Y];
|
v_t *y = (v_t *)c[TARGET_Y];
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
const v_t * const yend = y + (tsize / sizeof (v_t));
|
const v_t * const yend = y + (tsize / sizeof (v_t));
|
||||||
|
|
||||||
@ -1001,11 +1001,11 @@ static void
|
|||||||
raidz_rec_pr_abd(void **t, const size_t tsize, void **c,
|
raidz_rec_pr_abd(void **t, const size_t tsize, void **c,
|
||||||
const unsigned *mul)
|
const unsigned *mul)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) t[TARGET_X];
|
v_t *x = (v_t *)t[TARGET_X];
|
||||||
v_t *y = (v_t *) t[TARGET_Y];
|
v_t *y = (v_t *)t[TARGET_Y];
|
||||||
const v_t * const xend = x + (tsize / sizeof (v_t));
|
const v_t * const xend = x + (tsize / sizeof (v_t));
|
||||||
const v_t *p = (v_t *) c[CODE_P];
|
const v_t *p = (v_t *)c[CODE_P];
|
||||||
const v_t *q = (v_t *) c[CODE_Q];
|
const v_t *q = (v_t *)c[CODE_Q];
|
||||||
|
|
||||||
REC_PR_DEFINE();
|
REC_PR_DEFINE();
|
||||||
|
|
||||||
@ -1127,10 +1127,10 @@ static void
|
|||||||
raidz_syn_qr_abd(void **c, const void *dc, const size_t tsize,
|
raidz_syn_qr_abd(void **c, const void *dc, const size_t tsize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) c[TARGET_X];
|
v_t *x = (v_t *)c[TARGET_X];
|
||||||
v_t *y = (v_t *) c[TARGET_Y];
|
v_t *y = (v_t *)c[TARGET_Y];
|
||||||
const v_t * const xend = x + (tsize / sizeof (v_t));
|
const v_t * const xend = x + (tsize / sizeof (v_t));
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
|
|
||||||
SYN_QR_DEFINE();
|
SYN_QR_DEFINE();
|
||||||
@ -1161,11 +1161,11 @@ static void
|
|||||||
raidz_rec_qr_abd(void **t, const size_t tsize, void **c,
|
raidz_rec_qr_abd(void **t, const size_t tsize, void **c,
|
||||||
const unsigned *mul)
|
const unsigned *mul)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) t[TARGET_X];
|
v_t *x = (v_t *)t[TARGET_X];
|
||||||
v_t *y = (v_t *) t[TARGET_Y];
|
v_t *y = (v_t *)t[TARGET_Y];
|
||||||
const v_t * const xend = x + (tsize / sizeof (v_t));
|
const v_t * const xend = x + (tsize / sizeof (v_t));
|
||||||
const v_t *p = (v_t *) c[CODE_P];
|
const v_t *p = (v_t *)c[CODE_P];
|
||||||
const v_t *q = (v_t *) c[CODE_Q];
|
const v_t *q = (v_t *)c[CODE_Q];
|
||||||
|
|
||||||
REC_QR_DEFINE();
|
REC_QR_DEFINE();
|
||||||
|
|
||||||
@ -1291,11 +1291,11 @@ static void
|
|||||||
raidz_syn_pqr_abd(void **c, const void *dc, const size_t tsize,
|
raidz_syn_pqr_abd(void **c, const void *dc, const size_t tsize,
|
||||||
const size_t dsize)
|
const size_t dsize)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) c[TARGET_X];
|
v_t *x = (v_t *)c[TARGET_X];
|
||||||
v_t *y = (v_t *) c[TARGET_Y];
|
v_t *y = (v_t *)c[TARGET_Y];
|
||||||
v_t *z = (v_t *) c[TARGET_Z];
|
v_t *z = (v_t *)c[TARGET_Z];
|
||||||
const v_t * const yend = y + (tsize / sizeof (v_t));
|
const v_t * const yend = y + (tsize / sizeof (v_t));
|
||||||
const v_t *d = (v_t *) dc;
|
const v_t *d = (v_t *)dc;
|
||||||
const v_t * const dend = d + (dsize / sizeof (v_t));
|
const v_t * const dend = d + (dsize / sizeof (v_t));
|
||||||
|
|
||||||
SYN_PQR_DEFINE();
|
SYN_PQR_DEFINE();
|
||||||
@ -1328,13 +1328,13 @@ static void
|
|||||||
raidz_rec_pqr_abd(void **t, const size_t tsize, void **c,
|
raidz_rec_pqr_abd(void **t, const size_t tsize, void **c,
|
||||||
const unsigned * const mul)
|
const unsigned * const mul)
|
||||||
{
|
{
|
||||||
v_t *x = (v_t *) t[TARGET_X];
|
v_t *x = (v_t *)t[TARGET_X];
|
||||||
v_t *y = (v_t *) t[TARGET_Y];
|
v_t *y = (v_t *)t[TARGET_Y];
|
||||||
v_t *z = (v_t *) t[TARGET_Z];
|
v_t *z = (v_t *)t[TARGET_Z];
|
||||||
const v_t * const xend = x + (tsize / sizeof (v_t));
|
const v_t * const xend = x + (tsize / sizeof (v_t));
|
||||||
const v_t *p = (v_t *) c[CODE_P];
|
const v_t *p = (v_t *)c[CODE_P];
|
||||||
const v_t *q = (v_t *) c[CODE_Q];
|
const v_t *q = (v_t *)c[CODE_Q];
|
||||||
const v_t *r = (v_t *) c[CODE_R];
|
const v_t *r = (v_t *)c[CODE_R];
|
||||||
|
|
||||||
REC_PQR_DEFINE();
|
REC_PQR_DEFINE();
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ zfs_dbgmsg_data(char *buf, size_t size, void *data)
|
|||||||
zfs_dbgmsg_t *zdm = (zfs_dbgmsg_t *)data;
|
zfs_dbgmsg_t *zdm = (zfs_dbgmsg_t *)data;
|
||||||
|
|
||||||
(void) snprintf(buf, size, "%-12llu %-s\n",
|
(void) snprintf(buf, size, "%-12llu %-s\n",
|
||||||
(u_longlong_t) zdm->zdm_timestamp, zdm->zdm_msg);
|
(u_longlong_t)zdm->zdm_timestamp, zdm->zdm_msg);
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
@ -4463,7 +4463,7 @@ zfs_ioc_recv_new(const char *fsname, nvlist_t *innvl, nvlist_t *outnvl)
|
|||||||
return (error);
|
return (error);
|
||||||
|
|
||||||
error = nvlist_lookup_byte_array(innvl, "begin_record",
|
error = nvlist_lookup_byte_array(innvl, "begin_record",
|
||||||
(uchar_t **) &begin_record, &begin_record_size);
|
(uchar_t **)&begin_record, &begin_record_size);
|
||||||
if (error != 0 || begin_record_size != sizeof (*begin_record))
|
if (error != 0 || begin_record_size != sizeof (*begin_record))
|
||||||
return (SET_ERROR(EINVAL));
|
return (SET_ERROR(EINVAL));
|
||||||
|
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -1577,7 +1577,7 @@ zio_delay_interrupt(zio_t *zio)
|
|||||||
* OpenZFS's timeout_generic().
|
* OpenZFS's timeout_generic().
|
||||||
*/
|
*/
|
||||||
tid = taskq_dispatch_delay(system_taskq,
|
tid = taskq_dispatch_delay(system_taskq,
|
||||||
(task_func_t *) zio_interrupt,
|
(task_func_t *)zio_interrupt,
|
||||||
zio, TQ_NOSLEEP, expire_at_tick);
|
zio, TQ_NOSLEEP, expire_at_tick);
|
||||||
if (tid == TASKQID_INVALID) {
|
if (tid == TASKQID_INVALID) {
|
||||||
/*
|
/*
|
||||||
|
@ -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;
|
||||||
|
@ -314,7 +314,7 @@ zpl_mkdir(struct inode *dir, struct dentry *dentry, zpl_umode_t mode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
zpl_rmdir(struct inode * dir, struct dentry *dentry)
|
zpl_rmdir(struct inode *dir, struct dentry *dentry)
|
||||||
{
|
{
|
||||||
cred_t *cr = CRED();
|
cred_t *cr = CRED();
|
||||||
int error;
|
int error;
|
||||||
@ -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;
|
||||||
|
|
||||||
|
@ -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 */
|
||||||
|
@ -928,7 +928,7 @@ zpios_open(struct inode *inode, struct file *file)
|
|||||||
spin_lock_init(&info->info_lock);
|
spin_lock_init(&info->info_lock);
|
||||||
info->info_size = ZPIOS_INFO_BUFFER_SIZE;
|
info->info_size = ZPIOS_INFO_BUFFER_SIZE;
|
||||||
info->info_buffer =
|
info->info_buffer =
|
||||||
(char *) vmem_alloc(ZPIOS_INFO_BUFFER_SIZE, KM_SLEEP);
|
(char *)vmem_alloc(ZPIOS_INFO_BUFFER_SIZE, KM_SLEEP);
|
||||||
|
|
||||||
info->info_head = info->info_buffer;
|
info->info_head = info->info_buffer;
|
||||||
file->private_data = (void *)info;
|
file->private_data = (void *)info;
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user