From 2003ca965d2905e240f2b2f1c596aa02f7786c77 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sun, 4 Oct 2015 11:39:35 +0200 Subject: Zero-pad last block if a file hole is created on Write() Fixes TestFileHoles test --- pathfs_frontend/file_holes.go | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pathfs_frontend/file_holes.go (limited to 'pathfs_frontend/file_holes.go') diff --git a/pathfs_frontend/file_holes.go b/pathfs_frontend/file_holes.go new file mode 100644 index 0000000..8c9c83f --- /dev/null +++ b/pathfs_frontend/file_holes.go @@ -0,0 +1,38 @@ +package pathfs_frontend + +import ( + "fmt" + "github.com/hanwen/go-fuse/fuse" + "github.com/rfjakob/gocryptfs/cryptfs" +) + +// Will a write to offset "off" create a file hole? +func (f *file) createsHole(cipherSize uint64, off int64) bool { + nextBlock := f.cfs.BlockNoCipherOff(cipherSize) + targetBlock := f.cfs.BlockNoPlainOff(uint64(off)) + if targetBlock > nextBlock { + return true + } + return false +} + +// Zero-pad the file if a write to "off" creates a file hole +func (f *file) conditionalZeroPad(off int64) fuse.Status { + fi, err := f.fd.Stat() + if err != nil { + cryptfs.Warn.Printf("conditionalZeroPad: Stat: %v\n", err) + return fuse.ToStatus(err) + } + cipherSize := uint64(fi.Size()) + + if f.createsHole(cipherSize, off) == false { + return fuse.OK + } + + plainSize := f.cfs.PlainSize(cipherSize) + lastBlockLen := plainSize % f.cfs.PlainBS() + missing := f.cfs.PlainBS() - lastBlockLen + pad := make([]byte, missing) + _, status := f.doWrite(pad, int64(plainSize)) + return status +} -- cgit v1.2.3