Skip to content

[EROFS] Add support for xattr reservation of the base layer rootdir - #340

Merged
BigVan merged 1 commit into
containerd:mainfrom
salvete:main
Jul 30, 2024
Merged

[EROFS] Add support for xattr reservation of the base layer rootdir#340
BigVan merged 1 commit into
containerd:mainfrom
salvete:main

Conversation

@salvete

@salvete salvete commented Jul 29, 2024

Copy link
Copy Markdown
Member

What this PR does / why we need it:
Set the minimum inline xattr size for the root directory of the base layer, as there may not be enough room for xattr during the incremental build process.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Please check the following list:

  • Does the affected code have corresponding tests, e.g. unit test, E2E test?
  • Does this change require a documentation update?
  • Does this introduce breaking changes that would require an announcement or bumping the major version?
  • Do all new files have an appropriate license header?

Comment thread src/overlaybd/tar/erofs/liberofs.cpp Outdated
#define round_down_blk(addr) ((addr) & (~(SECTOR_SIZE - 1)))
#define round_up_blk(addr) (round_down_blk((addr) + SECTOR_SIZE - 1))
#define min(a, b) (a) < (b) ? (a) : (b)
#define EROFS_ROOT_ATTR_SIZE (16 * 1024)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

EROFS_ROOT_XATTR_SZ

Otherwise it looks good to me.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Done.

@salvete salvete changed the title [EROFS] Add support for xattr reservation of the base layser rootdir [EROFS] Add support for xattr reservation of the base layer rootdir Jul 29, 2024
Set the minimum inline xattr size for the root directory of the base
layer, as there may not be enough room for xattr during the incremental
build process.

Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
@hsiangkao

Copy link
Copy Markdown
Member

@BigVan PTAL

@BigVan
BigVan merged commit 35d90d2 into containerd:main Jul 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants