c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 19:28:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

txg: generalise txg_wait_synced_sig() to txg_wait_synced_flags() (#17284)

Browse Source 
txg_wait_synced_sig() is "wait for txg, unless a signal arrives". We
expect that future development will require similar "wait unless X"
behaviour.

This generalises the API as txg_wait_synced_flags(), where the provided
flags describe the events that should cause the call to return.

Instead of a boolean, the return is now an error code, which the caller
can use to know which event caused the call to return.

The existing call to txg_wait_synced_sig() is now
txg_wait_synced_flags(TXG_WAIT_SIGNAL).

Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.

Signed-off-by: Rob Norris <robn@despairlabs.com>
Reviewed-by: Allan Jude <allan@klarasystems.com>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
This commit is contained in:
Rob Norris
2025-05-03 08:29:50 +10:00
committed by GitHub
parent f85c96edf7
commit a7de203c86
4 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/dsl_synctask.c
+13 -6
View File
@@ -86,12 +86,19 @@ top:
dmu_tx_commit(tx);
if (sigfunc != NULL && txg_wait_synced_sig(dp, dst.dst_txg)) {
/* current contract is to call func once */
sigfunc(arg, tx);
sigfunc = NULL; /* in case we're performing an EAGAIN retry */
}
txg_wait_synced(dp, dst.dst_txg);
if (sigfunc != NULL) {
err = txg_wait_synced_flags(dp, dst.dst_txg, TXG_WAIT_SIGNAL);
if (err != 0) {
VERIFY3U(err, ==, EINTR);
/* current contract is to call func once */
sigfunc(arg, tx);
/* in case we're performing an EAGAIN retry */
sigfunc = NULL;
txg_wait_synced(dp, dst.dst_txg);
}
} else
txg_wait_synced(dp, dst.dst_txg);
if (dst.dst_error == EAGAIN) {
txg_wait_synced(dp, dst.dst_txg + TXG_DEFER_SIZE);