Skip to content

[Carry] mount: handle loopback mount#4902

Merged
estesp merged 4 commits intocontainerd:masterfrom
mxpv:losetup
Jan 8, 2021
Merged

[Carry] mount: handle loopback mount#4902
estesp merged 4 commits intocontainerd:masterfrom
mxpv:losetup

Conversation

@mxpv
Copy link
Copy Markdown
Member

@mxpv mxpv commented Jan 4, 2021

This PR carries changes from #4178 (and addresses comments). This (hopefully) should also address flaky test with losetup #4897

cc: @bergwolf @zhsj @AkihiroSuda

bergwolf and others added 3 commits January 4, 2021 10:14
If a mount has specified `loop` option, we need to handle it on our
own instead of passing it to the kernel. In such case, create a
loopback device, attach the mount source to it, and mount the loopback
device rather than the mount source.

Signed-off-by: Peng Tao <[email protected]>
No need to use the private losetup command line wrapper package.
The generic package provides the same functionality.

Signed-off-by: Peng Tao <[email protected]>
@containerd containerd deleted a comment from theopenlab-ci Bot Jan 4, 2021
Comment thread mount/losetup_linux.go Outdated
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.

200 seems too large. I suggest 100.

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.

Updated

Signed-off-by: Maksym Pavlenko <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 5, 2021

Build succeeded.

@containerd containerd deleted a comment from theopenlab-ci Bot Jan 5, 2021
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 75c2646 into containerd:master Jan 8, 2021
@mxpv mxpv deleted the losetup branch January 11, 2021 17:44
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.

4 participants