Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openzfs: Account for padding in itx_t for purecap #2100

Merged
merged 1 commit into from
May 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sys/contrib/subrepo-openzfs/module/zfs/zil.c
Original file line number Diff line number Diff line change
Expand Up @@ -2351,7 +2351,8 @@
itx_t *itx;

ASSERT3U(olrsize, >=, sizeof (lr_t));
lrsize = P2ROUNDUP_TYPED(olrsize, sizeof (uint64_t), size_t);
lrsize = MAX(olrsize, sizeof (itx_t) - offsetof(itx_t, itx_lr));

Check failure on line 2354 in sys/contrib/subrepo-openzfs/module/zfs/zil.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('
lrsize = P2ROUNDUP_TYPED(lrsize, sizeof (uint64_t), size_t);

Check failure on line 2355 in sys/contrib/subrepo-openzfs/module/zfs/zil.c

View workflow job for this annotation

GitHub Actions / Style Checker

space prohibited between function name and open parenthesis '('
ASSERT3U(lrsize, >=, olrsize);
itxsize = offsetof(itx_t, itx_lr) + lrsize;

Expand Down
Loading