Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix l2arc_dev_rebuild_start thread name 

`thread_create` on FreeBSD stringifies the argument passed as the
thread function to create a name for the thread. The thread name for
`l2arc_dev_rebuild_start` ended up with `(void (*)(void *))` in it.

Change the type signature so the function does not need to be cast
when creating the thread.  Rename the function to
`l2arc_dev_rebuild_thread` for clarity and consistency, as well.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10716
This commit is contained in:
Ryan Moeller 2020-08-17 14:02:32 -04:00 committed by GitHub
parent 3c3d7c8a57
commit 3eaf76a8d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
module/zfs/arc.c
View File

@ -920,7 +920,7 @@ unsigned long l2arc_rebuild_blocks_min_l2size = 1024 * 1024 * 1024;
/* L2ARC persistence rebuild control routines. */ /* L2ARC persistence rebuild control routines. */
void l2arc_rebuild_vdev(vdev_t *vd, boolean_t reopen); void l2arc_rebuild_vdev(vdev_t *vd, boolean_t reopen);
static void l2arc_dev_rebuild_start(l2arc_dev_t *dev); static void l2arc_dev_rebuild_thread(void *arg);
static int l2arc_rebuild(l2arc_dev_t *dev); static int l2arc_rebuild(l2arc_dev_t *dev);
/* L2ARC persistence read I/O routines. */ /* L2ARC persistence read I/O routines. */
@ -9500,8 +9500,7 @@ l2arc_spa_rebuild_start(spa_t *spa)
mutex_enter(&l2arc_rebuild_thr_lock); mutex_enter(&l2arc_rebuild_thr_lock);
if (dev->l2ad_rebuild && !dev->l2ad_rebuild_cancel) { if (dev->l2ad_rebuild && !dev->l2ad_rebuild_cancel) {
dev->l2ad_rebuild_began = B_TRUE; dev->l2ad_rebuild_began = B_TRUE;
(void) thread_create(NULL, 0, (void) thread_create(NULL, 0, l2arc_dev_rebuild_thread,
(void (*)(void *))l2arc_dev_rebuild_start,
dev, 0, &p0, TS_RUN, minclsyspri); dev, 0, &p0, TS_RUN, minclsyspri);
} }
mutex_exit(&l2arc_rebuild_thr_lock); mutex_exit(&l2arc_rebuild_thr_lock);
@ -9512,8 +9511,10 @@ l2arc_spa_rebuild_start(spa_t *spa)
* Main entry point for L2ARC rebuilding. * Main entry point for L2ARC rebuilding.
*/ */
static void static void
l2arc_dev_rebuild_start(l2arc_dev_t *dev) l2arc_dev_rebuild_thread(void *arg)
{ {
l2arc_dev_t *dev = arg;
VERIFY(!dev->l2ad_rebuild_cancel); VERIFY(!dev->l2ad_rebuild_cancel);
VERIFY(dev->l2ad_rebuild); VERIFY(dev->l2ad_rebuild);
(void) l2arc_rebuild(dev); (void) l2arc_rebuild(dev);