diff options
| -rw-r--r-- | cryptfs/cryptfs_content.go | 1 | ||||
| -rw-r--r-- | cryptfs/log.go | 2 | ||||
| -rw-r--r-- | pathfs_frontend/file.go | 13 |
3 files changed, 11 insertions, 5 deletions
diff --git a/cryptfs/cryptfs_content.go b/cryptfs/cryptfs_content.go index a4dc78a..a903e02 100644 --- a/cryptfs/cryptfs_content.go +++ b/cryptfs/cryptfs_content.go @@ -79,6 +79,7 @@ func (be *CryptFS) DecryptBlock(ciphertext []byte) ([]byte, error) { if err != nil { Warn.Printf("DecryptBlock: %s, len=%d, md5=%s\n", err.Error(), len(ciphertextOrig), Warn.Md5sum(ciphertextOrig)) + Debug.Println(hex.Dump(ciphertextOrig)) return nil, err } diff --git a/cryptfs/log.go b/cryptfs/log.go index 850ec9e..0884473 100644 --- a/cryptfs/log.go +++ b/cryptfs/log.go @@ -34,7 +34,7 @@ func (l *logChannel) Enable() { // CPU cycles func (l *logChannel) Md5sum(buf []byte) string { if l.enabled == false { - return "" + return "disabled" } return md5sum(buf) } diff --git a/pathfs_frontend/file.go b/pathfs_frontend/file.go index de00a11..9c58557 100644 --- a/pathfs_frontend/file.go +++ b/pathfs_frontend/file.go @@ -164,7 +164,7 @@ func (f *file) Write(data []byte, off int64) (uint32, fuse.Status) { blockData = f.cfs.EncryptBlock(blockData) cryptfs.Debug.Printf("ino%d: Writing %d bytes to block #%d, md5=%s\n", f.ino, len(blockData), b.BlockNo, cryptfs.Debug.Md5sum(blockData)) if len(blockData) != int(f.cfs.CipherBS()) { - cryptfs.Debug.Printf("ino%d: Writing partial block #%d (%d bytes)\n", b.BlockNo, len(blockData)) + cryptfs.Debug.Printf("ino%d: Writing partial block #%d (%d bytes)\n", f.ino, b.BlockNo, len(blockData)) } f.lock.Lock() _, err := f.fd.WriteAt(blockData, int64(blockOffset)) @@ -230,8 +230,12 @@ func (f *file) Truncate(newSize uint64) fuse.Status { cryptfs.Warn.Printf("Truncate: fstat failed: %v\n", err) return fuse.ToStatus(err) } - oldSize := uint64(fi.Size()) - + oldSize := f.cfs.PlainSize(uint64(fi.Size())) + { + oldB := (oldSize + f.cfs.PlainBS() - 1) / f.cfs.PlainBS() + newB := (newSize + f.cfs.PlainBS() - 1) / f.cfs.PlainBS() + cryptfs.Debug.Printf("ino%d: truncate from %d to %d blocks (%d to %d bytes)\n", f.ino, oldB, newB, oldSize, newSize) + } // Grow file by appending zeros if newSize > oldSize { remaining := newSize - oldSize @@ -259,7 +263,7 @@ func (f *file) Truncate(newSize uint64) fuse.Status { } return fuse.OK } - + // else: // Shrink file by truncating newBlockLen := int(newSize % f.cfs.PlainBS()) // New file size is aligned to block size - just truncate @@ -271,6 +275,7 @@ func (f *file) Truncate(newSize uint64) fuse.Status { return fuse.ToStatus(err) } // New file size is not aligned - need to do RMW on the last block + cryptfs.Debug.Printf("Truncate: Shrink RMW\n") var blockOffset, blockLen uint64 { // Get the block the last byte belongs to. |