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.

Sign up for GitHub

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

Jump to bottom

sync with upstream zfs-2.2-release branch #164

Merged
merged 2 commits into from
Sep 12, 2023
Merged

sync with upstream zfs-2.2-release branch #164

merged 2 commits into from
Sep 12, 2023

Conversation

ixhamza
Copy link

@ixhamza ixhamza commented Sep 12, 2023

Sync with upstream zfs-2.2-release branch

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:

amotin and others added 2 commits September 10, 2023 14:02
@amotin @behlendorf
Add more constraints for block cloning.
e96fbdb 
 - We cannot clone into files with smaller block size if there is
more than one block, since we can not grow the block size.
 - Block size must be power-of-2 if destination offset != 0, since
there can be no multiple blocks of non-power-of-2 size.

The first should handle the case when destination file has several
blocks but still is not bigger than one block of the source file.
The second fixes panic in dmu_buf_hold_array_by_dnode() on attempt
to concatenate files with equal but non-power-of-2 block sizes.

While there, assert that error is reported if we made no progress.

Signed-off-by:	Alexander Motin <[email protected]>
Sponsored by:	iXsystems, Inc.
@ixhamza
Merge branch 'zfs-2.2-release' into truenas/zfs-2.2-release
ad9aab0 
Signed-off-by: Ameer Hamza <[email protected]>
@amotin amotin merged commit 50ed8e6 into truenas/zfs-2.2-release Sep 12, 2023
17 of 18 checks passed
@amotin amotin deleted the sync-zfs-2.2-release branch September 12, 2023 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@usaleem-ix usaleem-ix usaleem-ix approved these changes

@amotin amotin amotin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ixhamza @amotin @usaleem-ix