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

Handle EINTR returned by Fallocate

Browse Source 
Fallocate can return EINTR (interrupted system call) and does so
quite often when cpu profiling is enabled.
This commit is contained in:
Jakob Unterwurzacher 2015-12-13 17:17:01 +01:00
parent b02ad12814
commit 8518d6d7bd
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pathfs_frontend/file.go
View File

@ -97,9 +97,9 @@ func (f *file) createHeader() error {
// Prevent partially written (=corrupt) header by preallocating the space beforehand // Prevent partially written (=corrupt) header by preallocating the space beforehand
f.fdLock.Lock() f.fdLock.Lock()
defer f.fdLock.Unlock() defer f.fdLock.Unlock()
err := syscall.Fallocate(int(f.fd.Fd()), FALLOC_FL_KEEP_SIZE, 0, cryptfs.HEADER_LEN) err := fallocateRetry(int(f.fd.Fd()), FALLOC_FL_KEEP_SIZE, 0, cryptfs.HEADER_LEN)
if err != nil { if err != nil {
cryptfs.Warn.Printf("createHeader: Fallocate failed: %s\n", err.Error()) cryptfs.Warn.Printf("createHeader: fallocateRetry failed: %s\n", err.Error())
return err return err
} }
@ -205,6 +205,17 @@ func (f *file) Read(buf []byte, off int64) (resultData fuse.ReadResult, code fus
return fuse.ReadResultData(out), status return fuse.ReadResultData(out), status
} }
// fallocateRetry - syscall.Fallocate() with retry for EINTR.
func fallocateRetry(fd int, mode uint32, off int64, len int64) (err error) {
for {
err = syscall.Fallocate(fd, mode, off, len)
if err == syscall.EINTR {
continue
}
return err
}
}
const FALLOC_FL_KEEP_SIZE = 0x01 const FALLOC_FL_KEEP_SIZE = 0x01
// doWrite - encrypt "data" and write it to plaintext offset "off" // doWrite - encrypt "data" and write it to plaintext offset "off"
@ -258,10 +269,10 @@ func (f *file) doWrite(data []byte, off int64) (uint32, fuse.Status) {
// Prevent partially written (=corrupt) blocks by preallocating the space beforehand // Prevent partially written (=corrupt) blocks by preallocating the space beforehand
f.fdLock.Lock() f.fdLock.Lock()
err := syscall.Fallocate(int(f.fd.Fd()), FALLOC_FL_KEEP_SIZE, int64(blockOffset), int64(blockLen)) err := fallocateRetry(int(f.fd.Fd()), FALLOC_FL_KEEP_SIZE, int64(blockOffset), int64(blockLen))
f.fdLock.Unlock() f.fdLock.Unlock()
if err != nil { if err != nil {
cryptfs.Warn.Printf("doWrite: Fallocate failed: %s\n", err.Error()) cryptfs.Warn.Printf("doWrite: fallocateRetry failed: %s\n", err.Error())
status = fuse.ToStatus(err) status = fuse.ToStatus(err)
break break
} }