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

FreeBSD: catch up with 1300124 version bump #11136

Merged
merged 1 commit into from
Oct 30, 2020

Conversation

mjguzik
Copy link
Contributor

@mjguzik mjguzik commented Oct 30, 2020

  • use cache_vop_mkdir
  • cache_rename -> cache_vop_rename

Signed-off-by: Mateusz Guzik mjguzik@gmail.com

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)
  • Documentation (a change to man pages or other documentation)

Checklist:

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Oct 30, 2020
@behlendorf
Copy link
Contributor

Looks like this isn't quite right yet.

/var/lib/buildbot/slaves/zfs/FreeBSD_head_amd64__TEST_/build/zfs/module/os/freebsd/zfs/zfs_vnops_os.c:3646:4: error: implicit declaration of function 'cache_vop_rename' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                        cache_vop_rename(sdvp, *svpp, tdvp, *tvpp, scnp, tcnp);
                        ^
/var/lib/buildbot/slaves/zfs/FreeBSD_head_amd64__TEST_/build/zfs/module/os/freebsd/zfs/zfs_vnops_os.c:3646:4: note: did you mean 'cache_rename'?
/usr/src/sys/sys/vnode.h:644:6: note: 'cache_rename' declared here
void    cache_rename(struct vnode *fdvp, struct vnode *fvp, struct vnode *tdvp,
        ^
1 error generated.
*** [zfs_vnops_os.o] Error code 1

- use cache_vop_mkdir
- cache_rename -> cache_vop_rename

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
@mjguzik
Copy link
Contributor Author

mjguzik commented Oct 30, 2020

Sorry about that, the ifdef covered FreeBSD 12, but not the older development branch this still builds against.

@ghost
Copy link

ghost commented Oct 30, 2020

This builds against the stable/12 snapshot from yesterday, it shouldn't be that old :)

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Oct 30, 2020
@ghost
Copy link

ghost commented Oct 30, 2020

Builds fine with the fix from #11139

@behlendorf behlendorf merged commit 115216c into openzfs:master Oct 30, 2020
behlendorf pushed a commit that referenced this pull request Oct 30, 2020
- use cache_vop_mkdir
- cache_rename -> cache_vop_rename

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Allan Jude <allan@klarasystems.com>
Reviewed-by: Matt Macy <mmacy@FreeBSD.org>
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Closes #11136
@mjguzik mjguzik deleted the catchup_1300124 branch October 30, 2020 23:45
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
- use cache_vop_mkdir
- cache_rename -> cache_vop_rename

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Allan Jude <allan@klarasystems.com>
Reviewed-by: Matt Macy <mmacy@FreeBSD.org>
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Closes openzfs#11136
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
- use cache_vop_mkdir
- cache_rename -> cache_vop_rename

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Allan Jude <allan@klarasystems.com>
Reviewed-by: Matt Macy <mmacy@FreeBSD.org>
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Closes openzfs#11136
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.

4 participants