aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2023-12-08 13:10:36 +0100
committerJakob Unterwurzacher2023-12-08 13:10:36 +0100
commit930dcfbb0ddd6f38824c2ae775ba32e6b0312857 (patch)
tree560452227e4f777f64e302491454aa3ee7ccba4d
parentf77477ca03c1ac9391e92719a33e58330ad8ff37 (diff)
TestFileHoleCopy: improve error msgparalin-update-deps
Relates-to: https://github.com/rfjakob/gocryptfs/issues/812
-rw-r--r--internal/fusefrontend_reverse/node_helpers.go1
-rw-r--r--tests/plaintextnames/file_holes_test.go4
2 files changed, 3 insertions, 2 deletions
diff --git a/internal/fusefrontend_reverse/node_helpers.go b/internal/fusefrontend_reverse/node_helpers.go
index 96c3c2d..8a1556f 100644
--- a/internal/fusefrontend_reverse/node_helpers.go
+++ b/internal/fusefrontend_reverse/node_helpers.go
@@ -115,6 +115,7 @@ func (n *Node) isRoot() bool {
return &rn.Node == n
}
+// Handle LOOKUP gocryptfs.longname.*.name
func (n *Node) lookupLongnameName(ctx context.Context, nameFile string, out *fuse.EntryOut) (ch *fs.Inode, errno syscall.Errno) {
d, errno := n.prepareAtSyscall("")
if errno != 0 {
diff --git a/tests/plaintextnames/file_holes_test.go b/tests/plaintextnames/file_holes_test.go
index a17597a..f4dfad9 100644
--- a/tests/plaintextnames/file_holes_test.go
+++ b/tests/plaintextnames/file_holes_test.go
@@ -92,7 +92,7 @@ func doTestFileHoleCopy(t *testing.T, name string, writeOffsets []int64) {
// (looking at "filefrag -v", it seems like ext4 needs 4kB extra once
// you have >=4 extents)
if st.Blocks != st0.Blocks && st.Blocks != st0.Blocks-8 && st.Blocks != st0.Blocks+8 {
- t.Errorf("size changed: st0.Blocks=%d st%d.Blocks=%d", st0.Blocks, i, st.Blocks)
+ t.Errorf("error: size changed: st0.Blocks=%d st%d.Blocks=%d", st0.Blocks, i, st.Blocks)
}
}
@@ -123,7 +123,7 @@ func doTestFileHoleCopy(t *testing.T, name string, writeOffsets []int64) {
}
}
-// TestFileHoleCopy creates a sparse times, copies it a few times, and check if
+// TestFileHoleCopy creates a sparse file, copies it a few times, and checks if
// the copies are the same (including the location of holes and data sections).
//
// The test runs with -plaintextnames because that makes it easier to manipulate