Run gofmt.

fuse/api.go

@@ -36,7 +36,7 @@ type FsNode interface {
 	// other inodes.
 	Deletable() bool
 	OnForget()
-	
+
 	// Misc.
 	Access(mode uint32, context *Context) (code Status)
 	Readlink(c *Context) ([]byte, Status)

fuse/defaultnode.go

@@ -8,6 +8,7 @@ import (
 var _ = log.Println
 
 type DefaultNodeFileSystem struct {
+
 }
 
 func (me *DefaultNodeFileSystem) OnUnmount() {
@@ -102,7 +103,7 @@ func (me *DefaultFsNode) OpenDir(context *Context) (chan DirEntry, Status) {
 	ch := me.Inode().Children()
 	s := make(chan DirEntry, len(ch))
 	for name, child := range ch {
-		fi, code  := child.FsNode().GetAttr(nil, context)
+		fi, code := child.FsNode().GetAttr(nil, context)
 		if code.Ok() {
 			s <- DirEntry{Name: name, Mode: fi.Mode}
 		}

fuse/fsops.go

@@ -337,4 +337,3 @@ func (me *FileSystemConnector) Flush(header *InHeader, input *FlushIn) Status {
 	opened := node.mount.getOpenedFile(input.Fh)
 	return opened.WithFlags.File.Flush()
 }
-

fuse/loopback_test.go

@@ -72,7 +72,7 @@ func NewTestCase(t *testing.T) *testCase {
 
 	var rfs RawFileSystem
 	me.pathFs = NewPathNodeFs(pfs, &PathNodeFsOptions{
-	ClientInodes: true})
+		ClientInodes: true})
 	me.connector = NewFileSystemConnector(me.pathFs,
 		&FileSystemOptions{
 			EntryTimeout:    testTtl,

fuse/memnode.go

@@ -13,9 +13,9 @@ var _ = log.Println
 type MemNodeFs struct {
 	DefaultNodeFileSystem
 	backingStore string
-	root *memNode
+	root         *memNode
 
-	mutex sync.Mutex
+	mutex    sync.Mutex
 	nextFree int
 }
 
@@ -53,10 +53,10 @@ func (me *MemNodeFs) Filename(n *Inode) string {
 type memNode struct {
 	DefaultFsNode
 	fs *MemNodeFs
-	id     int
-	
-	link    string
-	info    os.FileInfo
+	id int
+
+	link string
+	info os.FileInfo
 }
 
 func (me *memNode) newNode(isdir bool) *memNode {
@@ -88,7 +88,6 @@ func (me *memNode) Unlink(name string, context *Context) (code Status) {
 	return OK
 }
 
-
 func (me *memNode) Rmdir(name string, context *Context) (code Status) {
 	return me.Unlink(name, context)
 }
@@ -98,7 +97,7 @@ func (me *memNode) Symlink(name string, content string, context *Context) (fi *o
 	n.info.Mode = S_IFLNK | 0777
 	n.link = content
 	me.Inode().AddChild(name, n.Inode())
-	
+
 	return &n.info, n, OK
 }
 
@@ -118,7 +117,7 @@ func (me *memNode) Link(name string, existing FsNode, context *Context) (fi *os.
 func (me *memNode) Create(name string, flags uint32, mode uint32, context *Context) (file File, fi *os.FileInfo, newNode FsNode, code Status) {
 	n := me.newNode(false)
 	n.info.Mode = mode | S_IFREG
-	
+
 	f, err := os.Create(n.filename())
 	if err != nil {
 		return nil, nil, nil, OsErrorToErrno(err)
@@ -147,7 +146,7 @@ func (me *memNodeFile) Flush() Status {
 func (me *memNode) newFile(f *os.File) File {
 	return &memNodeFile{
 		LoopbackFile: LoopbackFile{File: f},
-		node: me,
+		node:         me,
 	}
 }
 
@@ -160,7 +159,6 @@ func (me *memNode) Open(flags uint32, context *Context) (file File, code Status)
 	return me.newFile(f), OK
 }
 
-
 func (me *memNode) GetAttr(file File, context *Context) (fi *os.FileInfo, code Status) {
 	return &me.info, OK
 }
@@ -195,6 +193,3 @@ func (me *memNode) Chown(file File, uid uint32, gid uint32, context *Context) (c
 	me.info.Ctime_ns = time.Nanoseconds()
 	return OK
 }
-
-
-

fuse/memnode_test.go

@@ -17,7 +17,7 @@ func setupMemNodeTest(t *testing.T) (wd string, fs *MemNodeFs, clean func()) {
 	fs = NewMemNodeFs(back)
 	mnt := tmp + "/mnt"
 	os.Mkdir(mnt, 0700)
-	
+
 	connector := NewFileSystemConnector(fs,
 		&FileSystemOptions{
 			EntryTimeout:    testTtl,
@@ -37,14 +37,14 @@ func setupMemNodeTest(t *testing.T) (wd string, fs *MemNodeFs, clean func()) {
 		state.Unmount()
 		os.RemoveAll(tmp)
 	}
-	
+
 }
 
 func TestMemNodeFs(t *testing.T) {
 	wd, _, clean := setupMemNodeTest(t)
 	defer clean()
 
-	err := ioutil.WriteFile(wd + "/test", []byte{42}, 0644)
+	err := ioutil.WriteFile(wd+"/test", []byte{42}, 0644)
 	CheckSuccess(err)
 
 	fi, err := os.Lstat(wd + "/test")
@@ -52,10 +52,9 @@ func TestMemNodeFs(t *testing.T) {
 	if fi.Size != 1 {
 		t.Errorf("Size after write incorrect: got %d want 1", fi.Size)
 	}
-	
+
 	entries, err := ioutil.ReadDir(wd)
 	if len(entries) != 1 || entries[0].Name != "test" {
 		t.Fatalf("Readdir got %v, expected 1 file named 'test'", entries)
 	}
 }
-

fuse/pathfs.go

@@ -91,7 +91,6 @@ func (me *PathNodeFs) Unmount(path string) Status {
 	return me.connector.Unmount(node)
 }
 
-
 func (me *PathNodeFs) OnUnmount() {
 }
 

unionfs/memunionfs.go

@@ -3,7 +3,7 @@ package unionfs
 import (
 	"fmt"
 	"github.com/hanwen/go-fuse/fuse"
- 	"log"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -17,9 +17,9 @@ var _ = log.Println
 type MemUnionFs struct {
 	fuse.DefaultNodeFileSystem
 	backingStore string
-	root *memNode
+	root         *memNode
 
-	mutex sync.Mutex
+	mutex    sync.Mutex
 	nextFree int
 
 	readonly fuse.FileSystem
@@ -27,7 +27,7 @@ type MemUnionFs struct {
 
 type memNode struct {
 	fuse.DefaultFsNode
-	fs     *MemUnionFs
+	fs *MemUnionFs
 
 	original string
 
@@ -108,36 +108,36 @@ func (me *memNode) Readlink(c *fuse.Context) ([]byte, fuse.Status) {
 func (me *memNode) Lookup(name string, context *fuse.Context) (fi *os.FileInfo, node fuse.FsNode, code fuse.Status) {
 	me.mutex.RLock()
 	defer me.mutex.RUnlock()
-	
+
 	if _, del := me.deleted[name]; del {
 		return nil, nil, fuse.ENOENT
 	}
-	
+
 	if me.original == "" && me != me.fs.root {
 		return nil, nil, fuse.ENOENT
 	}
-	
+
 	fn := filepath.Join(me.original, name)
 	fi, code = me.fs.readonly.GetAttr(fn, context)
 	if !code.Ok() {
 		return nil, nil, code
 	}
 
-	child := me.newNode(fi.Mode & fuse.S_IFDIR != 0)
+	child := me.newNode(fi.Mode&fuse.S_IFDIR != 0)
 	child.info = *fi
 	child.original = fn
-	if child.info.Mode & fuse.S_IFLNK != 0 {
+	if child.info.Mode&fuse.S_IFLNK != 0 {
 		child.link, _ = me.fs.readonly.Readlink(fn, context)
 	}
 	me.Inode().AddChild(name, child.Inode())
 
-	return fi, child, fuse.OK 
+	return fi, child, fuse.OK
 }
 
 func (me *memNode) Mkdir(name string, mode uint32, context *fuse.Context) (fi *os.FileInfo, newNode fuse.FsNode, code fuse.Status) {
 	me.mutex.Lock()
 	defer me.mutex.Unlock()
-	
+
 	me.deleted[name] = false, false
 	n := me.newNode(true)
 	n.changed = true
@@ -157,7 +157,7 @@ func (me *memNode) Unlink(name string, context *fuse.Context) (code fuse.Status)
 		return fuse.ENOENT
 	}
 	me.touch()
-	
+
 	return fuse.OK
 }
 
@@ -240,9 +240,9 @@ func (me *memNodeFile) Flush() fuse.Status {
 
 func (me *memNode) newFile(f fuse.File, writable bool) fuse.File {
 	return &memNodeFile{
-		File: f,
+		File:     f,
 		writable: writable,
-		node: me,
+		node:     me,
 	}
 }
 
@@ -270,10 +270,10 @@ func (me *memNode) promote() {
 }
 
 func (me *memNode) Open(flags uint32, context *fuse.Context) (file fuse.File, code fuse.Status) {
-	if flags & fuse.O_ANYWRITE != 0 {
+	if flags&fuse.O_ANYWRITE != 0 {
 		me.mutex.Lock()
 		defer me.mutex.Unlock()
-		
+
 		me.promote()
 		me.touch()
 	}
@@ -283,7 +283,7 @@ func (me *memNode) Open(flags uint32, context *fuse.Context) (file fuse.File, co
 		if err != nil {
 			return nil, fuse.OsErrorToErrno(err)
 		}
-		wr := flags & fuse.O_ANYWRITE != 0
+		wr := flags&fuse.O_ANYWRITE != 0
 		return me.newFile(&fuse.LoopbackFile{File: f}, wr), fuse.OK
 	}
 
@@ -291,7 +291,7 @@ func (me *memNode) Open(flags uint32, context *fuse.Context) (file fuse.File, co
 	if !code.Ok() {
 		return nil, code
 	}
-	
+
 	return me.newFile(file, false), fuse.OK
 }
 
@@ -342,10 +342,10 @@ func (me *memNode) Chown(file fuse.File, uid uint32, gid uint32, context *fuse.C
 	if context.Uid != 0 {
 		return fuse.EPERM
 	}
-	
+
 	me.mutex.Lock()
 	defer me.mutex.Unlock()
-	
+
 	me.info.Uid = int(uid)
 	me.info.Gid = int(gid)
 	me.ctouch()
@@ -365,7 +365,7 @@ func (me *memNode) OpenDir(context *fuse.Context) (stream chan fuse.DirEntry, co
 	}
 
 	for k, n := range me.Inode().FsChildren() {
-		fi, code  := n.FsNode().GetAttr(nil, nil)
+		fi, code := n.FsNode().GetAttr(nil, nil)
 		if !code.Ok() {
 			panic("child does not have mode.")
 		}

unionfs/memunionfs_test.go

@@ -21,7 +21,7 @@ var CheckSuccess = fuse.CheckSuccess
 func setupMemUfs(t *testing.T) (workdir string, cleanup func()) {
 	// Make sure system setting does not affect test.
 	syscall.Umask(0)
-	
+
 	wd, _ := ioutil.TempDir("", "")
 	err := os.Mkdir(wd+"/mount", 0700)
 	fuse.CheckSuccess(err)
@@ -545,7 +545,7 @@ func TestMemUnionFsTruncGetAttr(t *testing.T) {
 	err = f.Close()
 	CheckSuccess(err)
 
-	fi, err :=  os.Lstat(wd+"/mount/file")
+	fi, err := os.Lstat(wd + "/mount/file")
 	if fi.Size != int64(len(c)) {
 		t.Fatalf("Length mismatch got %d want %d", fi.Size, len(c))
 	}

unionfs/unionfs.go

@@ -622,12 +622,12 @@ func (me *UnionFs) promoteDirsTo(filename string) fuse.Status {
 		j := len(todo) - i - 1
 		d := todo[j]
 		r := results[j]
-		code := me.fileSystems[0].Mkdir(d, r.attr.Mode & 07777, nil)
+		code := me.fileSystems[0].Mkdir(d, r.attr.Mode&07777, nil)
 		if code != fuse.OK {
 			log.Println("Error creating dir leading to path", d, code)
 			return fuse.EPERM
 		}
-		
+
 		me.fileSystems[0].Utimens(d, uint64(r.attr.Atime_ns), uint64(r.attr.Mtime_ns), nil)
 		r.branch = 0
 		me.branchCache.Set(d, r)

unionfs/unionfs_test.go

@@ -30,7 +30,7 @@ var testOpts = UnionFsOptions{
 func setupUfs(t *testing.T) (workdir string, cleanup func()) {
 	// Make sure system setting does not affect test.
 	syscall.Umask(0)
-	
+
 	wd, _ := ioutil.TempDir("", "")
 	err := os.Mkdir(wd+"/mount", 0700)
 	fuse.CheckSuccess(err)
@@ -1061,13 +1061,12 @@ func TestTruncGetAttr(t *testing.T) {
 	err = f.Close()
 	CheckSuccess(err)
 
-	fi, err :=  os.Lstat(wd+"/mount/file")
+	fi, err := os.Lstat(wd + "/mount/file")
 	if fi.Size != int64(len(c)) {
 		t.Fatalf("Length mismatch got %d want %d", fi.Size, len(c))
 	}
 }
 
-
 func TestPromoteDirTimeStamp(t *testing.T) {
 	wd, clean := setupUfs(t)
 	defer clean()
@@ -1076,7 +1075,7 @@ func TestPromoteDirTimeStamp(t *testing.T) {
 	CheckSuccess(err)
 	err = ioutil.WriteFile(wd+"/ro/subdir/file", []byte("hello"), 0644)
 	CheckSuccess(err)
-	
+
 	err = os.Chmod(wd+"/mount/subdir/file", 0060)
 	CheckSuccess(err)