The branch main has been updated by mjg:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f40d6217f20d69427b58d82ce4e29d88bf4dfbd6

commit f40d6217f20d69427b58d82ce4e29d88bf4dfbd6
Author:     Mateusz Guzik <[email protected]>
AuthorDate: 2021-01-25 21:28:05 +0000
Commit:     Mateusz Guzik <[email protected]>
CommitDate: 2021-01-25 22:40:14 +0000

    zfs: fix panics with invariant kernels from zfs_replay_setattr
---
 sys/contrib/openzfs/module/zfs/zfs_replay.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys/contrib/openzfs/module/zfs/zfs_replay.c 
b/sys/contrib/openzfs/module/zfs/zfs_replay.c
index cba5e8c9cd0b..53c7dbd5df43 100644
--- a/sys/contrib/openzfs/module/zfs/zfs_replay.c
+++ b/sys/contrib/openzfs/module/zfs/zfs_replay.c
@@ -859,7 +859,12 @@ zfs_replay_setattr(void *arg1, void *arg2, boolean_t 
byteswap)
        zfsvfs->z_fuid_replay = zfs_replay_fuid_domain(start, &start,
            lr->lr_uid, lr->lr_gid);
 
+       /*
+        * Satisfy assertions.
+        */
+       vn_seqc_write_begin(ZTOV(zp));
        error = zfs_setattr(zp, vap, 0, kcred);
+       vn_seqc_write_end(ZTOV(zp));
 
        zfs_fuid_info_free(zfsvfs->z_fuid_replay);
        zfsvfs->z_fuid_replay = NULL;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"

Reply via email to