Polish.

README

@@ -75,7 +75,7 @@ KNOWN PROBLEMS
 
 Grep source code for TODO.  Major topics:
 
-* Missing support for file locking: FUSE_GETLK, FUSE_SETLK, FUSE_SETLKW
+* Missing support for file locking: FUSE_GETLK, FUSE_SETLK, FUSE_SETLKW, STATFS
 
 * Missing support for FUSE_INTERRUPT, FUSE_NOTIFY, CUSE, BMAP, POLL, IOCTL
 

fuse/fuse.go

@@ -9,7 +9,8 @@ import (
 
 const (
 	// bufSize should be a power of two to minimize lossage in
-	// BufferPool.
+	// BufferPool.  The minimum is 8k, but it doesn't cost anything to
+	// use a much larger buffer.
 	bufSize = (1 << 16)
 	maxRead = bufSize - PAGESIZE
 )

fuse/loopback.go

@@ -51,10 +51,10 @@ func (me *LoopbackFileSystem) OpenDir(name string) (stream chan DirEntry, status
 	if err != nil {
 		return nil, OsErrorToErrno(err)
 	}
-	output := make(chan DirEntry, 500)
+	want := 500
+	output := make(chan DirEntry, want)
 	go func() {
 		for {
-			want := 500
 			infos, err := f.Readdir(want)
 			for i, _ := range infos {
 				output <- DirEntry{

fuse/opcode.go

@@ -59,6 +59,11 @@ const (
 ////////////////////////////////////////////////////////////////
 
 func doInit(state *MountState, req *request) {
+	const (
+		FUSE_KERNEL_VERSION = 7
+		FUSE_KERNEL_MINOR_VERSION = 13
+	)
+	
 	input := (*InitIn)(req.inData)
 	if input.Major != FUSE_KERNEL_VERSION {
 		log.Printf("Major versions does not match. Given %d, want %d\n", input.Major, FUSE_KERNEL_VERSION)

fuse/types.go

@@ -6,43 +6,20 @@ import (
 )
 
 const (
-	FUSE_KERNEL_VERSION = 7
-
-	FUSE_KERNEL_MINOR_VERSION = 13
-
 	FUSE_ROOT_ID = 1
 
-
-	// OpenIn.Flags
-	FOPEN_DIRECT_IO   = (1 << 0)
-	FOPEN_KEEP_CACHE  = (1 << 1)
-	FOPEN_NONSEEKABLE = (1 << 2)
-
 	FUSE_UNKNOWN_INO = 0xffffffff
 
 	CUSE_UNRESTRICTED_IOCTL = (1 << 0)
 
 	FUSE_RELEASE_FLUSH = (1 << 0)
 
-	// If set, GetAttrIn has a file handle set.
-	FUSE_GETATTR_FH = (1 << 0)
-
 	FUSE_LK_FLOCK = (1 << 0)
 
-	FUSE_WRITE_CACHE     = (1 << 0)
-	FUSE_WRITE_LOCKOWNER = (1 << 1)
-
-	FUSE_READ_LOCKOWNER = (1 << 1)
-
-	FUSE_IOCTL_COMPAT       = (1 << 0)
-	FUSE_IOCTL_UNRESTRICTED = (1 << 1)
-	FUSE_IOCTL_RETRY        = (1 << 2)
-
 	FUSE_IOCTL_MAX_IOV = 256
 
 	FUSE_POLL_SCHEDULE_NOTIFY = (1 << 0)
 
-	FUSE_MIN_READ_BUFFER = 8192
 	CUSE_INIT_INFO_MAX   = 4096
 
 	S_IFDIR = syscall.S_IFDIR
@@ -149,6 +126,11 @@ type ForgetIn struct {
 	Nlookup uint64
 }
 
+const (
+	// Mask for GetAttrIn.Flags. If set, GetAttrIn has a file handle set.
+	FUSE_GETATTR_FH = (1 << 0)
+)
+
 type GetAttrIn struct {
 	Flags        uint32
 	Dummy        uint32
@@ -214,6 +196,13 @@ type SetAttrIn struct {
 	Unused5 uint32
 }
 
+const (
+	// OpenIn.Flags
+	FOPEN_DIRECT_IO   = (1 << 0)
+	FOPEN_KEEP_CACHE  = (1 << 1)
+	FOPEN_NONSEEKABLE = (1 << 2)
+)
+
 type OpenIn struct {
 	Flags  uint32
 	Unused uint32
@@ -251,6 +240,9 @@ type FlushIn struct {
 	LockOwner uint64
 }
 
+const (
+	FUSE_READ_LOCKOWNER = (1 << 1)
+)
 type ReadIn struct {
 	Fh        uint64
 	Offset    uint64
@@ -261,6 +253,11 @@ type ReadIn struct {
 	Padding   uint32
 }
 
+
+const (
+	FUSE_WRITE_CACHE     = (1 << 0)
+	FUSE_WRITE_LOCKOWNER = (1 << 1)
+)
 type WriteIn struct {
 	Fh         uint64
 	Offset     uint64
@@ -277,7 +274,7 @@ type WriteOut struct {
 }
 
 type StatfsOut struct {
-	St Kstatfs
+	Kstatfs
 }
 
 type FsyncIn struct {
@@ -382,6 +379,11 @@ type BmapOut struct {
 	Block uint64
 }
 
+const (
+	FUSE_IOCTL_COMPAT       = (1 << 0)
+	FUSE_IOCTL_UNRESTRICTED = (1 << 1)
+	FUSE_IOCTL_RETRY        = (1 << 2)
+)
 type IoctlIn struct {
 	Fh      uint64
 	Flags   uint32