c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-01-25 10:12:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

zvol_task_report_status: gate behind ZFS_DEBUG

Browse Source 
dprintf() is a no-op in production builds, giving a compile warning. So,
refactor it a little to keep all the strings inside the function, and
then make the function a no-op when ZFS_DEBUG is not set.

Reviewed-by: Allan Jude <allan@klarasystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Fedor Uporov <fuporov.vstack@gmail.com>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Sponsored-by: Klara, Inc.
Sponsored-by: Railway Corporation
Closes #17596
This commit is contained in:
Rob Norris 2025-07-25 13:17:18 +10:00 committed by Brian Behlendorf
parent e6eb03a991
commit e44e51f28d
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
module/zfs/zvol.c
View File

@ -1442,41 +1442,32 @@ zvol_task_update_status(zvol_task_t *task, uint64_t total, uint64_t done,
} }
} }
static const char *
zvol_task_op_msg(zvol_async_op_t op)
{
switch (op) {
case ZVOL_ASYNC_CREATE_MINORS:
return ("create");
case ZVOL_ASYNC_REMOVE_MINORS:
return ("remove");
case ZVOL_ASYNC_RENAME_MINORS:
return ("rename");
case ZVOL_ASYNC_SET_SNAPDEV:
case ZVOL_ASYNC_SET_VOLMODE:
return ("set property");
default:
return ("unknown");
}
__builtin_unreachable();
return (NULL);
}
static void static void
zvol_task_report_status(zvol_task_t *task) zvol_task_report_status(zvol_task_t *task)
{ {
#ifdef ZFS_DEBUG
static const char *const msg[] = {
"create",
"remove",
"rename",
"set snapdev",
"set volmode",
"unknown",
};
if (task->zt_status == 0) if (task->zt_status == 0)
return; return;
zvol_async_op_t op = MIN(task->zt_op, ZVOL_ASYNC_MAX);
if (task->zt_error) { if (task->zt_error) {
dprintf("The %s minors zvol task was not ok, last error %d\n", dprintf("The %s minors zvol task was not ok, last error %d\n",
zvol_task_op_msg(task->zt_op), task->zt_error); msg[op], task->zt_error);
} else { } else {
dprintf("The %s minors zvol task was not ok\n", dprintf("The %s minors zvol task was not ok\n", msg[op]);
zvol_task_op_msg(task->zt_op));
} }
#else
(void) task;
#endif
} }
/* /*