Skip to content

basic: Add BCACHEFS magic#33108

Merged
yuwata merged 1 commit intosystemd:mainfrom
cpackham-atlnz:main
May 31, 2024
Merged

basic: Add BCACHEFS magic#33108
yuwata merged 1 commit intosystemd:mainfrom
cpackham-atlnz:main

Conversation

@cpackham-atlnz
Copy link
Copy Markdown
Contributor

@cpackham-atlnz cpackham-atlnz commented May 30, 2024 •
edited by github-actions bot
Loading

Import magic.h from Linux 6.9 to get the definition of BCACHEFS_SUPER_MAGIC. Update filesystems-gperf.gperf to add knowledge of bcachefs.

This fixes the following error building against a bleeding edge kernel.

src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers:

Filesystem found in kernel header but not in filesystems-gperf.gperf: BCACHEFS_SUPER_MAGIC

@github-actions github-actions bot added util-lib please-review PR is ready for (re-)review by a maintainer labels May 30, 2024
@github-actions
Copy link
Copy Markdown

github-actions bot commented May 30, 2024

Important

An -rc1 tag has been created and a release is being prepared, so please note that PRs introducing new features and APIs will be held back until the new version has been released.

@bluca bluca added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed please-review PR is ready for (re-)review by a maintainer labels May 30, 2024
yuwata
yuwata requested changes May 30, 2024
View reviewed changes
src/basic/linux/magic.h Outdated
#define HOSTFS_SUPER_MAGIC 0x00c0ffee
#define OVERLAYFS_SUPER_MAGIC 0x794c7630
#define FUSE_SUPER_MAGIC 0x65735546
#define BCACHEFS_SUPER_MAGIC 0xca451a4e
Copy link
Copy Markdown
Member

@yuwata yuwata May 30, 2024

Choose a reason for hiding this comment

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

Please use missing_magic.h

@yuwata yuwata added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks and removed good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed labels May 30, 2024
@yuwata
Copy link
Copy Markdown
Member

yuwata commented May 31, 2024 •
edited
Loading

BTW, the change is already waiting in #33034.
@bluca Is #33034 too big for v256? That may look so, but all changes in the PR are actually trivial, like hwdb update that we always do before release.

@cpackham-atlnz
Copy link
Copy Markdown
Contributor Author

cpackham-atlnz commented May 31, 2024

@yuwata sorry I missed your PR I did do a quick search but obviously the github search doesn't catch the content of a PR (it does seem to find my PR because I mention BCACHEFS_SUPER_MAGIC in the message).

@yuwata
Copy link
Copy Markdown
Member

yuwata commented May 31, 2024 •
edited
Loading

@yuwata sorry I missed your PR I did do a quick search but obviously the github search doesn't catch the content of a PR (it does seem to find my PR because I mention BCACHEFS_SUPER_MAGIC in the message).

No problem. By moving the definition to missing_magic.h, then this can be merged earlier. After this is merged, I will rebase my PR on this. And, actually that's better work flow, as we can easily backport this PR to stable releases.

@cpackham-atlnz
basic: Add BCACHEFS magic
5223df7 
Import magic.h from Linux 6.9 to get the definition of
BCACHEFS_SUPER_MAGIC. Update filesystems-gperf.gperf to add knowledge of
bcachefs.

This fixes the following error building against a bleeding edge kernel.
```
src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers:

Filesystem found in kernel header but not in filesystems-gperf.gperf: BCACHEFS_SUPER_MAGIC
```
@github-actions github-actions bot added please-review PR is ready for (re-)review by a maintainer and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels May 31, 2024
@cpackham-atlnz
Copy link
Copy Markdown
Contributor Author

cpackham-atlnz commented May 31, 2024

Updated per @yuwata 's request. When #33034 is merged the change in missing_magic.h can be dropped

yuwata
yuwata approved these changes May 31, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@yuwata yuwata left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you!

@yuwata yuwata added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed please-review PR is ready for (re-)review by a maintainer labels May 31, 2024
@yuwata yuwata merged commit 201148b into systemd:main May 31, 2024
@github-actions github-actions bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label May 31, 2024
@bluca
Copy link
Copy Markdown
Member

bluca commented May 31, 2024

BTW, the change is already waiting in #33034. @bluca Is #33034 too big for v256? That may look so, but all changes in the PR are actually trivial, like hwdb update that we always do before release.

Given it doesn't fix a bug and compilation with kernel headers is often troublesome on weird architectures, let's wait for the next cycle

@yuwata
Copy link
Copy Markdown
Member

yuwata commented Jun 5, 2024

OK, yeah, I understand. I already set v257 tag on that.

@wdconinc wdconinc mentioned this pull request Oct 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bluca bluca bluca approved these changes

@yuwata yuwata yuwata approved these changes

Assignees

No one assigned

Labels

util-lib

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cpackham-atlnz @yuwata @bluca