Disable fallocate on OSX (not available and causes a build failure)
This commit is contained in:
parent
6a9da0db10
commit
f93729f20d
|
@ -0,0 +1,13 @@
|
||||||
|
package pathfs_frontend
|
||||||
|
|
||||||
|
import "syscall"
|
||||||
|
|
||||||
|
// prealloc - preallocate space without changing the file size. This prevents
|
||||||
|
// us from running out of space in the middle of an operation.
|
||||||
|
func prealloc(fd int, off int64, len int64) (err error) {
|
||||||
|
//
|
||||||
|
// Sorry, fallocate is not available on OSX at all and
|
||||||
|
// fcntl F_PREALLOCATE is not accessible from Go.
|
||||||
|
//
|
||||||
|
// See https://github.com/rfjakob/gocryptfs/issues/18 if you want to help.
|
||||||
|
}
|
|
@ -0,0 +1,18 @@
|
||||||
|
package pathfs_frontend
|
||||||
|
|
||||||
|
import "syscall"
|
||||||
|
|
||||||
|
// prealloc - preallocate space without changing the file size. This prevents
|
||||||
|
// us from running out of space in the middle of an operation.
|
||||||
|
func prealloc(fd int, off int64, len int64) (err error) {
|
||||||
|
for {
|
||||||
|
err = syscall.Fallocate(fd, FALLOC_FL_KEEP_SIZE, off, len)
|
||||||
|
if err == syscall.EINTR {
|
||||||
|
// fallocate, like many syscalls, can return EINTR. This is not an
|
||||||
|
// error and just signifies that the operation was interrupted by a
|
||||||
|
// signal and we should try again.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
|
@ -99,7 +99,7 @@ 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 := fallocateRetry(int(f.fd.Fd()), FALLOC_FL_KEEP_SIZE, 0, cryptfs.HEADER_LEN)
|
err := prealloc(int(f.fd.Fd()), 0, cryptfs.HEADER_LEN)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cryptfs.Warn.Printf("createHeader: fallocateRetry failed: %s\n", err.Error())
|
cryptfs.Warn.Printf("createHeader: fallocateRetry failed: %s\n", err.Error())
|
||||||
return err
|
return err
|
||||||
|
@ -207,17 +207,6 @@ 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"
|
||||||
|
@ -270,7 +259,7 @@ 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 := fallocateRetry(int(f.fd.Fd()), FALLOC_FL_KEEP_SIZE, int64(blockOffset), int64(blockLen))
|
err := prealloc(int(f.fd.Fd()), int64(blockOffset), int64(blockLen))
|
||||||
f.fdLock.Unlock()
|
f.fdLock.Unlock()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cryptfs.Warn.Printf("doWrite: fallocateRetry failed: %s\n", err.Error())
|
cryptfs.Warn.Printf("doWrite: fallocateRetry failed: %s\n", err.Error())
|
||||||
|
|
Loading…
Reference in New Issue