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

composefs: prefer std library functions #2050

Merged

Conversation

giuseppe
Copy link
Member

a couple of cleanups for the composefs backend

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
Copy link
Member Author

we use "ro" in composefs as well: https://github.com/containers/composefs/blob/main/libcomposefs/lcfs-mount.c#L582-L585, but MS_RDONLY should be enough

avoid dealing directly with file descriptors but use the standard
library functions.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe giuseppe force-pushed the composefs-reduce-unix-pkg-usage branch from 232a788 to 39098fb Compare July 30, 2024 16:15
@giuseppe
Copy link
Member Author

opened a PR for composefs as well: containers/composefs#309

@cgwalters PTAL

// do not worry about checking the magic number, if the file is invalid
// we will fail to mount it anyway
flags := make([]byte, 4)
nread, err := unix.Pread(fd, flags, 8)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really care too much, but I would note that I think we could use https://pkg.go.dev/os#File.ReadAt here instead

Copy link
Contributor

openshift-ci bot commented Jul 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (I didn’t look into the MS_RDONLY vs "ro" difference, if any).

@rhatdan
Copy link
Member

rhatdan commented Jul 30, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jul 30, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 39d469c into containers:main Jul 30, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants