summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/file-format.md2
-rw-r--r--internal/fusefrontend/dircache.go6
-rw-r--r--tests/test_helpers/mount_unmount.go4
3 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/file-format.md b/Documentation/file-format.md
index 5699f9e..04bd2fe 100644
--- a/Documentation/file-format.md
+++ b/Documentation/file-format.md
@@ -12,7 +12,7 @@ Data block, default AES-GCM mode
1-4096 bytes encrypted data
16 bytes GHASH
-Data block, AES-SIV mode (used in reverse mode, or when explicitely enabled with `-init -aessiv`)
+Data block, AES-SIV mode (used in reverse mode, or when explicitly enabled with `-init -aessiv`)
16 bytes nonce
16 bytes SIV
diff --git a/internal/fusefrontend/dircache.go b/internal/fusefrontend/dircache.go
index 5c8b760..6d0d570 100644
--- a/internal/fusefrontend/dircache.go
+++ b/internal/fusefrontend/dircache.go
@@ -14,8 +14,8 @@ import (
const (
// Number of entries in the dirCache. Three entries work well for two
// (probably also three) parallel tar extracts (hit rate around 92%).
- // Keen in sync with test_helpers.maxCacheFds !
- // TODO: How to share this constant without causing in import cycle?
+ // Keep in sync with test_helpers.maxCacheFds !
+ // TODO: How to share this constant without causing an import cycle?
dirCacheSize = 3
// Enable Lookup/Store/Clear debug messages
enableDebugMessages = false
@@ -52,7 +52,7 @@ type dirCacheStruct struct {
entries [dirCacheSize]dirCacheEntryStruct
// Where to store the next entry (index into entries)
nextIndex int
- // On the first Lookup(), the expire thread is stared, and this flag is set
+ // On the first Lookup(), the expire thread is started, and this flag is set
// to true.
expireThreadRunning bool
// Hit rate stats. Evaluated and reset by the expire thread.
diff --git a/tests/test_helpers/mount_unmount.go b/tests/test_helpers/mount_unmount.go
index 0a3bc1b..1d43418 100644
--- a/tests/test_helpers/mount_unmount.go
+++ b/tests/test_helpers/mount_unmount.go
@@ -123,8 +123,8 @@ func UnmountPanic(dir string) {
}
// gocryptfs may hold up to maxCacheFds open for caching
-// Keen in sync with fusefrontend.dirCacheSize
-// TODO: How to share this constant without causing in import cycle?!
+// Keep in sync with fusefrontend.dirCacheSize
+// TODO: How to share this constant without causing an import cycle?!
const maxCacheFds = 3
// UnmountErr tries to unmount "dir", retrying 10 times, and returns the