hardcoresushi
/
libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Truncate: Logging improvements, show number of blocks as float

This commit is contained in:
Jakob Unterwurzacher 2015-10-04 15:43:46 +02:00
parent b27edba2bb
commit aa6fa7f3cf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pathfs_frontend/file.go
View File

@ -241,9 +241,9 @@ func (f *file) Truncate(newSize uint64) fuse.Status {
} }
oldSize := f.cfs.PlainSize(uint64(fi.Size())) oldSize := f.cfs.PlainSize(uint64(fi.Size()))
{ {
oldB := (oldSize + f.cfs.PlainBS() - 1) / f.cfs.PlainBS() oldB := float32(oldSize) / float32(f.cfs.PlainBS())
newB := (newSize + f.cfs.PlainBS() - 1) / f.cfs.PlainBS() newB := float32(newSize) / float32(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) cryptfs.Debug.Printf("ino%d: FUSE Truncate from %.2f to %.2f blocks (%d to %d bytes)\n", f.ino, oldB, newB, oldSize, newSize)
} }
// File grows // File grows

2
pathfs_frontend/file_holes.go
View File

@ -2,6 +2,7 @@ package pathfs_frontend
import ( import (
"github.com/hanwen/go-fuse/fuse" "github.com/hanwen/go-fuse/fuse"
"github.com/rfjakob/gocryptfs/cryptfs"
) )
// Will a write to offset "off" create a file hole? // Will a write to offset "off" create a file hole?
@ -19,6 +20,7 @@ func (f *file) zeroPad(plainSize uint64) fuse.Status {
lastBlockLen := plainSize % f.cfs.PlainBS() lastBlockLen := plainSize % f.cfs.PlainBS()
missing := f.cfs.PlainBS() - lastBlockLen missing := f.cfs.PlainBS() - lastBlockLen
pad := make([]byte, missing) pad := make([]byte, missing)
cryptfs.Debug.Printf("zeroPad: Writing %d bytes\n", missing)
_, status := f.doWrite(pad, int64(plainSize)) _, status := f.doWrite(pad, int64(plainSize))
return status return status
} }