aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/vdev_removal.c
diff options
context:
space:
mode:
authorAlejandro Colomar <[email protected]>2022-03-05 01:25:22 +0100
committerGitHub <[email protected]>2022-03-04 16:25:22 -0800
commitdb7f1a91def6bbaf72dd3e9ad31255efb0bf81ab (patch)
tree1817651092cca3f549bf229436993cb10736706d /module/zfs/vdev_removal.c
parent06b805067833902613de1871fa01e29fc80c8247 (diff)
Use _Noreturn (C11; GNU89) properly
A function that returns with no value is a different thing from a function that doesn't return at all. Those are two orthogonal concepts, commonly confused. pthread_create(3) expects a pointer to a start routine that has a very precise prototype: void *(*start_routine)(void *); However, other thread functions, such as kernel ones, expect: void (*start_routine)(void *); Providing a different one is incorrect, and has only been working because the ABIs happen to produce a compatible function. We should use '_Noreturn void', since it's the natural type, and then provide a '_Noreturn void *' wrapper for pthread functions. For consistency, replace most cases of __NORETURN or __attribute__((noreturn)) by _Noreturn. _Noreturn is understood by -std=gnu89, so it should be safe to use everywhere. Ref: https://github.com/openzfs/zfs/pull/13110#discussion_r808450136 Ref: https://software.codidact.com/posts/285972 Reviewed-by: Brian Behlendorf <[email protected]> Co-authored-by: Ahelenia ZiemiaƄska <[email protected]> Signed-off-by: Alejandro Colomar <[email protected]> Closes #13120
Diffstat (limited to 'module/zfs/vdev_removal.c')
-rw-r--r--module/zfs/vdev_removal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/vdev_removal.c b/module/zfs/vdev_removal.c
index 64be84edd..6887b2f52 100644
--- a/module/zfs/vdev_removal.c
+++ b/module/zfs/vdev_removal.c
@@ -140,7 +140,7 @@ int zfs_removal_suspend_progress = 0;
#define VDEV_REMOVAL_ZAP_OBJS "lzap"
-static void spa_vdev_remove_thread(void *arg);
+static _Noreturn void spa_vdev_remove_thread(void *arg);
static int spa_vdev_remove_cancel_impl(spa_t *spa);
static void
@@ -1589,7 +1589,7 @@ spa_remove_max_segment(spa_t *spa)
* TXG have completed (see spa_txg_zio) and writes the new mappings to disk
* (see vdev_mapping_sync()).
*/
-static void
+static _Noreturn void
spa_vdev_remove_thread(void *arg)
{
spa_t *spa = arg;