Page MenuHomeFreeBSD

zfs: unbreak stable/13 clang build on i386 after b0c251b0d
ClosedPublic

Authored by mm on Jun 16 2021, 12:50 AM.
Tags
Referenced Files
Unknown Object (File)
Jan 25 2024, 12:46 AM
Unknown Object (File)
Dec 23 2023, 10:26 AM
Unknown Object (File)
Dec 12 2023, 12:04 PM
Unknown Object (File)
Aug 19 2023, 4:38 AM
Unknown Object (File)
Aug 16 2023, 8:08 AM
Unknown Object (File)
Aug 16 2023, 7:43 AM
Unknown Object (File)
Mar 22 2023, 8:12 AM
Unknown Object (File)
Mar 5 2023, 7:29 AM
Subscribers

Details

Summary

Add missing atomic operations from atomic.c

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

mm requested review of this revision.Jun 16 2021, 12:50 AM
mm created this revision.

Aaa... While the patch may be OK, I am surprised that my e76373de7b7384bb6e5c6fd5e04f15b54df20fb7 was merged into zfs-2.1-release before fef8bd41fc178d7212957b611c9bc81fe10cb63e. Merge in proper order would not cause this problem in first place. Do you have a clue why it was not done that way?

I assume Brian just forgot to merge that commit or intentionally didn't merge that commit and did not inspect your commit for changes in that direction. The i386 build should be broken for Linux as well.

Could you ask him to merge the dependency instead of creating unneeded divergence, unless there is a good cause?

I am definitely going to do that. But in the meantime we need a buildable stable/13 for i386. The solution I am proposing does (temporarily) place an additional file into cddl/lib/libspl what is outside of sys/contrib/openzfs.

Actually my original version was written in assembler to be added into atomic.S without using the compiler atomics: https://people.freebsd.org/~mav/zzz3S.patch . I think it would be more consistent with original code. But since it is hopefully temporary, I am fine with any approach.

This revision is now accepted and ready to land.Jun 16 2021, 1:33 AM

I am in for the assembler code patch. I will prepare an updated version.

This revision now requires review to proceed.Jun 16 2021, 1:55 AM
This revision was not accepted when it landed; it landed in state Needs Review.Jun 16 2021, 1:59 AM
This revision was automatically updated to reflect the committed changes.