aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2023-06-19 13:35:29 +0200
committerJakob Unterwurzacher2026-07-16 20:10:19 +0200
commitc12811349ec04a10e4090dc1becbf92380693f62 (patch)
treecc88c5747f73f311babaf64417ceceb52f46ae78
parent781f1b8be16c1ce4d5f9648641c28a13b258b2e9 (diff)
fusefrontend: sharedstorage: add warnings for lock failure
Complain loudly when the underlying storage does not support byte-range locks. https://github.com/rfjakob/gocryptfs/issues/754
-rw-r--r--internal/fusefrontend/file.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go
index 223c765..813f992 100644
--- a/internal/fusefrontend/file.go
+++ b/internal/fusefrontend/file.go
@@ -261,6 +261,7 @@ func (f *File) Read(ctx context.Context, buf []byte, off int64) (resultData fuse
blocks := f.contentEnc.ExplodePlainRange(uint64(off), uint64(len(buf)))
alignedOffset, alignedLength := blocks[0].JointCiphertextRange(blocks)
if err := f.LockSharedStorage(unix.F_RDLCK, int64(alignedOffset), int64(alignedLength)); err != nil {
+ tlog.Warn.Printf("ino%d: FUSE Read: LockSharedStorage(F_RDLCK, %d, %d) failed: %v", f.qIno.Ino, alignedOffset, alignedLength, err)
return nil, fs.ToErrno(err)
}
out, errno = f.doRead(buf[:0], uint64(off), uint64(len(buf)))
@@ -289,7 +290,7 @@ func (f *File) doWrite(data []byte, off int64) (uint32, syscall.Errno) {
// If the file ID is not cached, read it from disk
if f.fileTableEntry.ID == nil {
if err := f.LockSharedStorage(unix.F_WRLCK, 0, contentenc.HeaderLen); err != nil {
- tlog.Warn.Printf("ino%d: LockSharedStorage(F_WRLCK, %d, %d)failed: %v", 0, f.qIno.Ino, contentenc.HeaderLen, err)
+ tlog.Warn.Printf("ino%d: doWrite: LockSharedStorage(F_WRLCK, %d, %d) failed: %v", f.qIno.Ino, 0, contentenc.HeaderLen, err)
return 0, fs.ToErrno(err)
}
var err error