From aea8d8d6e7e0f852643804641b27d8038991eff9 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Wed, 30 Sep 2015 20:32:24 +0200
Subject: debug: Log encrypted filename

---
 pathfs_frontend/file.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pathfs_frontend/file.go b/pathfs_frontend/file.go
index 8cf070c..e3be7ff 100644
--- a/pathfs_frontend/file.go
+++ b/pathfs_frontend/file.go
@@ -71,7 +71,7 @@ func (f *file) doRead(off uint64, length uint64) ([]byte, fuse.Status) {
 	// Decrypt it
 	plaintext, err := f.cfs.DecryptBlocks(ciphertext)
 	if err != nil {
-		cryptfs.Warn.Printf("read: DecryptBlocks: %s\n", err.Error())
+		cryptfs.Warn.Printf("doRead: returning IO error\n")
 		return nil, fuse.EIO
 	}
 
@@ -92,7 +92,7 @@ func (f *file) doRead(off uint64, length uint64) ([]byte, fuse.Status) {
 
 // Read - FUSE call
 func (f *file) Read(buf []byte, off int64) (resultData fuse.ReadResult, code fuse.Status) {
-	cryptfs.Debug.Printf("Read: offset=%d length=%d\n", len(buf), off)
+	cryptfs.Debug.Printf("Read %s: offset=%d length=%d\n", f.fd.Name(), len(buf), off)
 
 	if f.writeOnly {
 		cryptfs.Warn.Printf("Tried to read from write-only file\n")
@@ -100,17 +100,21 @@ func (f *file) Read(buf []byte, off int64) (resultData fuse.ReadResult, code fus
 	}
 
 	out, status := f.doRead(uint64(off), uint64(len(buf)))
+
+	if status == fuse.EIO {
+		cryptfs.Warn.Printf("Read failed with EIO: file %s, offset=%d, length=%d\n", f.fd.Name(), len(buf), off)
+	}
 	if status != fuse.OK {
 		return nil, status
 	}
 
-	cryptfs.Debug.Printf("Read: returning %d bytes\n", len(out))
+	cryptfs.Debug.Printf("Read: status %v, returning %d bytes\n", status, len(out))
 	return fuse.ReadResultData(out), status
 }
 
 // Write - FUSE call
 func (f *file) Write(data []byte, off int64) (uint32, fuse.Status) {
-	cryptfs.Debug.Printf("Write: offset=%d length=%d\n", off, len(data))
+	cryptfs.Debug.Printf("Write %s: offset=%d length=%d\n", f.fd.Name(), off, len(data))
 
 	var written uint32
 	var status fuse.Status
-- 
cgit v1.2.3