Skip to content

[release/2.1] Support both styles of volatile mount option#13297

Merged
fuweid merged 1 commit into
containerd:release/2.1from
chrishenzie:release/2.1-volatile
Apr 27, 2026
Merged

[release/2.1] Support both styles of volatile mount option#13297
fuweid merged 1 commit into
containerd:release/2.1from
chrishenzie:release/2.1-volatile

Conversation

@chrishenzie

@chrishenzie chrishenzie commented Apr 27, 2026

Copy link
Copy Markdown
Member

Manual backport of #13256.

Support both "volatile" and "fsync=volatile" mount options for volatile snapshotter

Kernel 6.12.80+ returns 'fsync=volatile' instead of just 'volatile'
in mount options, which breaks containerd's exact string matching
checks.

Fixes this issue by adding support for 'fsync=volatile' in addition
to the existing 'volatile' check in RemoveVolatileOption and
addVolatileOptionOnImageVolumeMount.

Assisted-by: Antigravity
Signed-off-by: Chris Henzie <[email protected]>
(cherry picked from commit 93f7a62)
Signed-off-by: Chris Henzie <[email protected]>
@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Apr 27, 2026
@chrishenzie
chrishenzie marked this pull request as ready for review April 27, 2026 17:06
@dosubot dosubot Bot added the area/cri Container Runtime Interface (CRI) label Apr 27, 2026
@fuweid
fuweid merged commit 76bbd87 into containerd:release/2.1 Apr 27, 2026
51 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Apr 27, 2026
@chrishenzie
chrishenzie deleted the release/2.1-volatile branch April 28, 2026 15:40
@cpuguy83 cpuguy83 added impact/changelog area/snapshotters Snapshotters and removed area/cri Container Runtime Interface (CRI) labels May 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants