loopback: Utimens() has identical implementations in darwin and linux

Merge into files.go

fuse/nodefs/files.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"sync"
 	"syscall"
+	"time"
 
 	"github.com/hanwen/go-fuse/fuse"
 )
@@ -200,6 +201,32 @@ func (f *loopbackFile) GetAttr(a *fuse.Attr) fuse.Status {
 	return fuse.OK
 }
 
+const _UTIME_NOW = ((1 << 30) - 1)
+const _UTIME_OMIT = ((1 << 30) - 2)
+
+func (f *loopbackFile) Utimens(a *time.Time, m *time.Time) fuse.Status {
+	tv := make([]syscall.Timeval, 2)
+	if a == nil {
+		tv[0].Usec = _UTIME_OMIT
+	} else {
+		n := a.UnixNano()
+		tv[0] = syscall.NsecToTimeval(n)
+	}
+
+	if m == nil {
+		tv[1].Usec = _UTIME_OMIT
+	} else {
+		n := m.UnixNano()
+		tv[1] = syscall.NsecToTimeval(n)
+	}
+
+	f.lock.Lock()
+	err := syscall.Futimes(int(f.File.Fd()), tv)
+	f.lock.Unlock()
+
+	return fuse.ToStatus(err)
+}
+
 // Allocate, Utimens implemented in files_linux.go
 
 ////////////////////////////////////////////////////////////////

fuse/nodefs/files_darwin.go

@@ -60,29 +60,3 @@ func (f *loopbackFile) Allocate(off uint64, sz uint64, mode uint32) fuse.Status
 	}
 	return fuse.OK
 }
-
-const _UTIME_NOW = ((1 << 30) - 1)
-const _UTIME_OMIT = ((1 << 30) - 2)
-
-func (f *loopbackFile) Utimens(a *time.Time, m *time.Time) fuse.Status {
-	tv := make([]syscall.Timeval, 2)
-	if a == nil {
-		tv[0].Usec = _UTIME_OMIT
-	} else {
-		n := a.UnixNano()
-		tv[0] = syscall.NsecToTimeval(n)
-	}
-
-	if m == nil {
-		tv[1].Usec = _UTIME_OMIT
-	} else {
-		n := m.UnixNano()
-		tv[1] = syscall.NsecToTimeval(n)
-	}
-
-	f.lock.Lock()
-	err := syscall.Futimes(int(f.File.Fd()), tv)
-	f.lock.Unlock()
-
-	return fuse.ToStatus(err)
-}

fuse/nodefs/files_linux.go

@@ -2,7 +2,6 @@ package nodefs
 
 import (
 	"syscall"
-	"time"
 
 	"github.com/hanwen/go-fuse/fuse"
 )
@@ -16,28 +15,3 @@ func (f *loopbackFile) Allocate(off uint64, sz uint64, mode uint32) fuse.Status
 	}
 	return fuse.OK
 }
-
-const _UTIME_NOW = ((1 << 30) - 1)
-const _UTIME_OMIT = ((1 << 30) - 2)
-
-func (f *loopbackFile) Utimens(a *time.Time, m *time.Time) fuse.Status {
-	tv := make([]syscall.Timeval, 2)
-	if a == nil {
-		tv[0].Usec = _UTIME_OMIT
-	} else {
-		n := a.UnixNano()
-		tv[0] = syscall.NsecToTimeval(n)
-	}
-
-	if m == nil {
-		tv[1].Usec = _UTIME_OMIT
-	} else {
-		n := a.UnixNano()
-		tv[1] = syscall.NsecToTimeval(n)
-	}
-
-	f.lock.Lock()
-	err := syscall.Futimes(int(f.File.Fd()), tv)
-	f.lock.Unlock()
-	return fuse.ToStatus(err)
-}