Skip to content

backport: A couple of FreeBSD fixes #11668

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

Closed
wants to merge 2 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Mar 1, 2021

2e160de Fix assert in FreeBSD-specific dmu_read_pages
64e0fe1 Restore FreeBSD resource usage accounting

Motivation and Context

Description

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

The function has three similar pieces of code: for read-behind pages,
requested pages and read-ahead pages.  All three pieces had an
assert to ensure that the page is not mapped.  Later the assert was
relaxed to require that the page is not mapped for writing.  But that
was done in two places out of three.  This change fixes the third piece,
read-ahead.

Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Andriy Gapon <[email protected]>
Closes openzfs#11654
@ghost ghost requested a review from behlendorf March 1, 2021 17:14
Add zfs_racct_* interfaces for platform-dependent read/write accounting.

Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes openzfs#11613
@ghost ghost changed the title backport: Fix assert in FreeBSD-specific dmu_read_pages backport: A couple of FreeBSD fixes Mar 1, 2021
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Mar 3, 2021
@ghost
Copy link
Author

ghost commented Mar 6, 2021

(the desired commits are now in zfs-2.0.4-staging)

@ghost ghost closed this Mar 6, 2021
@ghost ghost deleted the backports branch March 6, 2021 11:46
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants