git: 9629ecfeefb3 - stable/13 - zfs: add missing seqc write begin/end around zfs_acl_chown_setattr

Martin Matuska mm at FreeBSD.org
Wed Mar 10 09:37:46 UTC 2021


The branch stable/13 has been updated by mm:

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

commit 9629ecfeefb3c3c89bafabb8e253d4dc98363f45
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-02-27 22:26:20 +0000
Commit:     Martin Matuska <mm at FreeBSD.org>
CommitDate: 2021-03-10 01:57:25 +0000

    zfs: add missing seqc write begin/end around zfs_acl_chown_setattr
    
    It happens to trip over an assert but does not matter for correctness at
    this time. However, do it for future proofing.
    
    Reported by:    avg
    
    (cherry picked from commit 1d8510c1a64d61a85c74c8b02fb12e6f31ede5a1)
---
 sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
index d5f0da9ecd4b..8172916c4329 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -2756,7 +2756,9 @@ zfs_setattr(znode_t *zp, vattr_t *vap, int flags, cred_t *cr)
 		err = zfs_acl_chown_setattr(zp);
 		ASSERT(err == 0);
 		if (attrzp) {
+			vn_seqc_write_begin(ZTOV(attrzp));
 			err = zfs_acl_chown_setattr(attrzp);
+			vn_seqc_write_end(ZTOV(attrzp));
 			ASSERT(err == 0);
 		}
 	}


More information about the dev-commits-src-all mailing list