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

ostree-prepare-root: print st_dev and st_ino as 64-bit ints #2219

Merged

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Oct 15, 2020

This matches what systemd does and should work fine on all platforms.

Possibly resolves: bugzilla.redhat.com/show_bug.cgi?id=1888436

@jlebon
Copy link
Member Author

jlebon commented Oct 15, 2020

Wait no, I don't think this is right actually.
/hold

This matches what systemd does and should work fine on all platforms.

Possibly resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1888436
@jlebon jlebon force-pushed the pr/fix-inode-print-format branch from caef3d1 to dec9eab Compare October 15, 2020 16:33
@jlebon
Copy link
Member Author

jlebon commented Oct 15, 2020

OK digging into the type of st_ino is confusing here because it also depends on whether LFS is enabled. Let's just match what systemd does and always cast to uint64_t. ⬆️

/hold cancel

@jlebon jlebon changed the title ostree-prepare-root: fix printing inode ostree-prepare-root: print st_dev and st_ino as 64-bit ints Oct 15, 2020
@cgwalters
Copy link
Member

Ah right we're passing a 64 bit value in args but systemd is only shifting 32.

It's unfortunate this isn't caught by the compiler...probably gcc isn't smart enough to understand the systemd journaling API?

Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold
for manual testing

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jlebon

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

@cgwalters
Copy link
Member

/hold cancel
This fix makes sense even if there are other bugs.

@openshift-merge-robot openshift-merge-robot merged commit e2d5e38 into ostreedev:master Oct 15, 2020
cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request Oct 22, 2020
cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request Oct 22, 2020
@jlebon jlebon deleted the pr/fix-inode-print-format branch April 24, 2023 02:49
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