remove writeback=0 workaround

The writeback=0 workaround should no longer be needed:
https://github.com/containerd/containerd/pull/3765#discussion_r345620213

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-08-18 03:19:53 +09:00
parent 09d9f2e651
commit 0c80e115b1
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
2 changed files with 0 additions and 9 deletions

View File

@ -50,7 +50,6 @@ func supportsReadonlyMultipleLowerDir(d string) error {
}
opts := []string{fmt.Sprintf("lowerdir=%s:%s", filepath.Join(td, "lower2"), filepath.Join(td, "lower1"))}
opts = append(opts, commonMountOptions...)
m := mount.Mount{
Type: "fuse3." + fuseoverlayfsBinary,
Source: "overlay",

View File

@ -41,13 +41,6 @@ const (
fuseoverlayfsBinary = "fuse-overlayfs"
)
var (
// workaround for the concurrency issue
// https://github.com/AkihiroSuda/containerd-fuse-overlayfs/issues/2
// https://github.com/containers/fuse-overlayfs/issues/134
commonMountOptions = []string{"writeback=0"}
)
func init() {
plugin.Register(&plugin.Registration{
Type: plugin.SnapshotPlugin,
@ -505,7 +498,6 @@ func (o *snapshotter) mounts(s storage.Snapshot, info snapshots.Info) []mount.Mo
if mapping, ok := info.Labels["containerd.io/snapshot/gidmapping"]; ok {
options = append(options, fmt.Sprintf("gidmapping=%s", mapping))
}
options = append(options, commonMountOptions...)
return []mount.Mount{
{
Type: "fuse3." + fuseoverlayfsBinary,