github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mount: make setupLoop() work with with Autoclear

Browse Source 
setupLoop()'s Autoclear (LO_FLAGS_AUTOCLEAR) will destruct the
loopback device when all associated file descriptors are closed.

However this behavior didn't work before since setupLoop() was
returning a file name. The looppack device was destructed at
the end of the function when LoopParams had Autoclear = true.

Fixes #4969.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2021-02-02 14:57:34 -08:00
parent ccde82da2b
commit 05a2e280ac
3 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mount/losetup_linux_test.go
View File

@@ -64,12 +64,13 @@ func TestRoLoop(t *testing.T) {
}
}()
path, err := setupLoop(backingFile, LoopParams{Readonly: true, Autoclear: true})
file, err := setupLoop(backingFile, LoopParams{Readonly: true, Autoclear: true})
if err != nil {
t.Fatal(err)
}
defer file.Close()
if err := ioutil.WriteFile(path, randomData, os.ModePerm); err == nil {
if _, err := file.Write(randomData); err == nil {
t.Fatalf("writing to readonly loop device should fail")
}
}
@@ -84,12 +85,13 @@ func TestRwLoop(t *testing.T) {
}
}()
path, err := setupLoop(backingFile, LoopParams{Autoclear: true})
file, err := setupLoop(backingFile, LoopParams{Autoclear: false})
if err != nil {
t.Fatal(err)
}
defer file.Close()
if err := ioutil.WriteFile(path, randomData, os.ModePerm); err != nil {
if _, err := file.Write(randomData); err != nil {
t.Fatal(err)
}
}