composefs use new mount api #2057
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexlarsson
reviewed
Aug 6, 2024
| @@ -154,8 +154,38 @@ func mountComposefsBlob(dataDir, mountPoint string) error { | |||
| mountOpts += "noacl" | |||
| } | |||
|
|
|||
| if err := unix.Mount(loop.Name(), mountPoint, "erofs", unix.MS_RDONLY, mountOpts); err != nil { | |||
| return fmt.Errorf("failed to mount erofs image at %q: %w", mountPoint, err) | |||
| fsfd, err := unix.Fsopen("erofs", 0) | |||
There was a problem hiding this comment.
How old is the new mount api? Don't we want to fall back to mount on ENOSYS?
There was a problem hiding this comment.
I didn't care about the fallback as old kernels do not support anyway the features we need in overlay (and possibly erofs itself)
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
128277d to
1a6957b
Compare
alexlarsson
approved these changes
Aug 6, 2024
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alexlarsson, giuseppe The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
the main advantage in this case is that it splits the mount operation in multiple steps, so it is easier (hopefully) to find out what goes wrong.