d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: Merge https://github.com/openzfs/zfs/pull/14739

Browse Source 
The zfs_log_clone_range() function is never called from the
zfs_clone_range_replay() function, so I assumed it is safe to assert
that zil_replaying() is never TRUE here. It turns out zil_replaying()
also returns TRUE when the sync property is set to disabled.

Fix the problem by just returning if zil_replaying() returns TRUE.

Reported by: Florian Smeets
Signed-off-by: Pawel Jakub Dawidek pawel@dawidek.net

Approved by: oshogbo, mm
This commit is contained in:
Pawel Jakub Dawidek 2023-04-17 02:22:56 -07:00
parent e0bb199925
commit 1959e122d9
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/contrib/openzfs/module/zfs/zfs_log.c
View File

@ -905,9 +905,7 @@ zfs_log_clone_range(zilog_t *zilog, dmu_tx_t *tx, int txtype, znode_t *zp,
uint64_t partlen, max_log_data;
size_t i, partnbps;
VERIFY(!zil_replaying(zilog, tx));
if (zp->z_unlinked)
if (zil_replaying(zilog, tx) || zp->z_unlinked)
return;
max_log_data = zil_max_log_data(zilog, sizeof (lr_clone_range_t));