zfs: Merge https://github.com/openzfs/zfs/pull/14739
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:
parent
e0bb199925
commit
1959e122d9
@ -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));
|
||||
|
Loading…
Reference in New Issue
Block a user