Merge pull request #122 from rakoo/fuse

Add fuse mount for browsing snapshots

.travis.yml

@@ -31,6 +31,7 @@ install:
   - go version | grep -q "darwin" && export GOX_OS="darwin" || true
   - uname -s | grep -qi darwin && brew install caskroom/cask/brew-cask || true
   - uname -s | grep -qi darwin && brew cask install osxfuse || true
+  - uname -s | grep -vqi darwin && export RESTIC_TEST_FUSE="0" || true
   - echo "cross-compile for \"$GOX_OS\" on \"$GOX_ARCH\""
   - gox -build-toolchain -os "$GOX_OS" -arch "$GOX_ARCH"
 

Godeps/Godeps.json

@@ -5,6 +5,10 @@
 		"./..."
 	],
 	"Deps": [
+		{
+			"ImportPath": "bazil.org/fuse",
+			"Rev": "18419ee53958df28fcfc9490fe6123bd59e237bb"
+		},
 		{
 			"ImportPath": "github.com/jessevdk/go-flags",
 			"Comment": "v1-297-g1b89bf7",

Godeps/_workspace/src/bazil.org/fuse/.gitattributes

@@ -0,0 +1,2 @@
+*.go filter=gofmt
+*.cgo filter=gofmt

Godeps/_workspace/src/bazil.org/fuse/.gitignore

@@ -0,0 +1,11 @@
+*~
+.#*
+## the next line needs to start with a backslash to avoid looking like
+## a comment
+\#*#
+.*.swp
+
+*.test
+
+/clockfs
+/hellofs

Godeps/_workspace/src/bazil.org/fuse/LICENSE

@@ -0,0 +1,93 @@
+Copyright (c) 2013-2015 Tommi Virtanen.
+Copyright (c) 2009, 2011, 2012 The Go Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+The following included software components have additional copyright
+notices and license terms that may differ from the above.
+
+
+File fuse.go:
+
+// Adapted from Plan 9 from User Space's src/cmd/9pfuse/fuse.c,
+// which carries this notice:
+//
+// The files in this directory are subject to the following license.
+//
+// The author of this software is Russ Cox.
+//
+//         Copyright (c) 2006 Russ Cox
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose without fee is hereby granted, provided that this entire notice
+// is included in all copies of any software which is or includes a copy
+// or modification of this software and in all copies of the supporting
+// documentation for such software.
+//
+// THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+// WARRANTY.  IN PARTICULAR, THE AUTHOR MAKES NO REPRESENTATION OR WARRANTY
+// OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
+// FITNESS FOR ANY PARTICULAR PURPOSE.
+
+
+File fuse_kernel.go:
+
+// Derived from FUSE's fuse_kernel.h
+/*
+   This file defines the kernel interface of FUSE
+   Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
+
+
+   This -- and only this -- header file may also be distributed under
+   the terms of the BSD Licence as follows:
+
+   Copyright (C) 2001-2007 Miklos Szeredi. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+*/

Godeps/_workspace/src/bazil.org/fuse/README.md

@@ -0,0 +1,23 @@
+bazil.org/fuse -- Filesystems in Go
+===================================
+
+`bazil.org/fuse` is a Go library for writing FUSE userspace
+filesystems.
+
+It is a from-scratch implementation of the kernel-userspace
+communication protocol, and does not use the C library from the
+project called FUSE. `bazil.org/fuse` embraces Go fully for safety and
+ease of programming.
+
+Here’s how to get going:
+
+    go get bazil.org/fuse
+
+Website: http://bazil.org/fuse/
+
+Github repository: https://github.com/bazil/fuse
+
+API docs: http://godoc.org/bazil.org/fuse
+
+Our thanks to Russ Cox for his fuse library, which this project is
+based on.

Godeps/_workspace/src/bazil.org/fuse/buffer.go

@@ -0,0 +1,35 @@
+package fuse
+
+import "unsafe"
+
+// buffer provides a mechanism for constructing a message from
+// multiple segments.
+type buffer []byte
+
+// alloc allocates size bytes and returns a pointer to the new
+// segment.
+func (w *buffer) alloc(size uintptr) unsafe.Pointer {
+	s := int(size)
+	if len(*w)+s > cap(*w) {
+		old := *w
+		*w = make([]byte, len(*w), 2*cap(*w)+s)
+		copy(*w, old)
+	}
+	l := len(*w)
+	*w = (*w)[:l+s]
+	return unsafe.Pointer(&(*w)[l])
+}
+
+// reset clears out the contents of the buffer.
+func (w *buffer) reset() {
+	for i := range (*w)[:cap(*w)] {
+		(*w)[i] = 0
+	}
+	*w = (*w)[:0]
+}
+
+func newBuffer(extra uintptr) buffer {
+	const hdrSize = unsafe.Sizeof(outHeader{})
+	buf := make(buffer, hdrSize, hdrSize+extra)
+	return buf
+}

Godeps/_workspace/src/bazil.org/fuse/debug.go

@@ -0,0 +1,21 @@
+package fuse
+
+import (
+	"runtime"
+)
+
+func stack() string {
+	buf := make([]byte, 1024)
+	return string(buf[:runtime.Stack(buf, false)])
+}
+
+func nop(msg interface{}) {}
+
+// Debug is called to output debug messages, including protocol
+// traces. The default behavior is to do nothing.
+//
+// The messages have human-friendly string representations and are
+// safe to marshal to JSON.
+//
+// Implementations must not retain msg.
+var Debug func(msg interface{}) = nop

Godeps/_workspace/src/bazil.org/fuse/doc/.gitignore

@@ -0,0 +1,4 @@
+/*.seq.svg
+
+# not ignoring *.seq.png; we want those committed to the repo
+# for embedding on Github

Godeps/_workspace/src/bazil.org/fuse/doc/README.md

@@ -0,0 +1,6 @@
+# bazil.org/fuse documentation
+
+See also API docs at http://godoc.org/bazil.org/fuse
+
+- [The mount sequence](mount-sequence.md)
+- [Writing documentation](writing-docs.md)

Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux-error-init.seq

@@ -0,0 +1,32 @@
+seqdiag {
+  app;
+  fuse [label="bazil.org/fuse"];
+  fusermount;
+  kernel;
+  mounts;
+
+  app;
+  fuse [label="bazil.org/fuse"];
+  fusermount;
+  kernel;
+  mounts;
+
+  app -> fuse [label="Mount"];
+  fuse -> fusermount [label="spawn, pass socketpair fd"];
+  fusermount -> kernel [label="open /dev/fuse"];
+  fusermount -> kernel [label="mount(2)"];
+  kernel ->> mounts [label="mount is visible"];
+  fusermount <-- kernel [label="mount(2) returns"];
+  fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd", leftnote="on Linux, successful exit here\nmeans the mount has happened,\nthough InitRequest might not have yet"];
+  app <-- fuse [label="Mount returns\nConn.Ready is already closed"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/fuse fd", note="starts with InitRequest"];
+  fuse -> app [label="Init"];
+  fuse <-- app [color=red];
+  fuse -> kernel [label="write /dev/fuse fd", color=red];
+  kernel -> kernel [label="set connection\nstate to error", color=red];
+  fuse <-- kernel;
+  ... conn.MountError == nil, so it is still mounted ...
+  ... call conn.Close to clean up ...
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux.seq

@@ -0,0 +1,41 @@
+seqdiag {
+  // seqdiag -T svg -o doc/mount-osx.svg doc/mount-osx.seq
+  app;
+  fuse [label="bazil.org/fuse"];
+  fusermount;
+  kernel;
+  mounts;
+
+  app -> fuse [label="Mount"];
+  fuse -> fusermount [label="spawn, pass socketpair fd"];
+  fusermount -> kernel [label="open /dev/fuse"];
+  fusermount -> kernel [label="mount(2)"];
+  kernel ->> mounts [label="mount is visible"];
+  fusermount <-- kernel [label="mount(2) returns"];
+  fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd", leftnote="on Linux, successful exit here\nmeans the mount has happened,\nthough InitRequest might not have yet"];
+  app <-- fuse [label="Mount returns\nConn.Ready is already closed", rightnote="InitRequest and StatfsRequest\nmay or may not be seen\nbefore Conn.Ready,\ndepending on platform"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/fuse fd", note="starts with InitRequest"];
+  fuse => app [label="FS/Node/Handle methods"];
+  fuse => kernel [label="write /dev/fuse fd"];
+  ... repeat ...
+
+  ... shutting down ...
+  app -> fuse [label="Unmount"];
+  fuse -> fusermount [label="fusermount -u"];
+  fusermount -> kernel;
+  kernel <<-- mounts;
+  fusermount <-- kernel;
+  fuse <<-- fusermount [diagonal];
+  app <-- fuse [label="Unmount returns"];
+
+  // actually triggers before above
+  fuse <<-- kernel [diagonal, label="/dev/fuse EOF"];
+  app <-- fuse [label="fs.Serve returns"];
+
+  app -> fuse [label="conn.Close"];
+  fuse -> kernel  [label="close /dev/fuse fd"];
+  fuse <-- kernel;
+  app <-- fuse;
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx-error-init.seq

@@ -0,0 +1,32 @@
+seqdiag {
+  app;
+  fuse [label="bazil.org/fuse"];
+  wait [label="callMount\nhelper goroutine"];
+  mount_osxfusefs;
+  kernel;
+
+  app -> fuse [label="Mount"];
+  fuse -> kernel [label="open /dev/osxfuseN"];
+  fuse -> mount_osxfusefs [label="spawn, pass fd"];
+  fuse -> wait [label="goroutine", note="blocks on cmd.Wait"];
+  app <-- fuse [label="Mount returns"];
+
+  mount_osxfusefs -> kernel [label="mount(2)"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/osxfuseN fd", note="starts with InitRequest,\nalso seen before mount exits:\ntwo StatfsRequest calls"];
+  fuse -> app [label="Init"];
+  fuse <-- app [color=red];
+  fuse -> kernel [label="write /dev/osxfuseN fd", color=red];
+  fuse <-- kernel;
+
+  mount_osxfusefs <-- kernel [label="mount(2) returns", color=red];
+  wait <<-- mount_osxfusefs [diagonal, label="exit", color=red];
+  app <<-- wait [diagonal, label="mount has failed,\nclose Conn.Ready", color=red];
+
+  // actually triggers before above
+  fuse <<-- kernel [diagonal, label="/dev/osxfuseN EOF"];
+  app <-- fuse [label="fs.Serve returns"];
+  ... conn.MountError != nil, so it was was never mounted ...
+  ... call conn.Close to clean up ...
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx.seq

@@ -0,0 +1,45 @@
+seqdiag {
+  // seqdiag -T svg -o doc/mount-osx.svg doc/mount-osx.seq
+  app;
+  fuse [label="bazil.org/fuse"];
+  wait [label="callMount\nhelper goroutine"];
+  mount_osxfusefs;
+  kernel;
+  mounts;
+
+  app -> fuse [label="Mount"];
+  fuse -> kernel [label="open /dev/osxfuseN"];
+  fuse -> mount_osxfusefs [label="spawn, pass fd"];
+  fuse -> wait [label="goroutine", note="blocks on cmd.Wait"];
+  app <-- fuse [label="Mount returns"];
+
+  mount_osxfusefs -> kernel [label="mount(2)"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/osxfuseN fd", note="starts with InitRequest,\nalso seen before mount exits:\ntwo StatfsRequest calls"];
+  fuse => app [label="FS/Node/Handle methods"];
+  fuse => kernel [label="write /dev/osxfuseN fd"];
+  ... repeat ...
+
+  kernel ->> mounts [label="mount is visible"];
+  mount_osxfusefs <-- kernel [label="mount(2) returns"];
+  wait <<-- mount_osxfusefs [diagonal, label="exit", leftnote="on OS X, successful exit\nhere means we finally know\nthe mount has happened\n(can't trust InitRequest,\nkernel might have timed out\nwaiting for InitResponse)"];
+
+  app <<-- wait [diagonal, label="mount is ready,\nclose Conn.Ready", rightnote="InitRequest and StatfsRequest\nmay or may not be seen\nbefore Conn.Ready,\ndepending on platform"];
+
+  ... shutting down ...
+  app -> fuse [label="Unmount"];
+  fuse -> kernel [label="umount(2)"];
+  kernel <<-- mounts;
+  fuse <-- kernel;
+  app <-- fuse [label="Unmount returns"];
+
+  // actually triggers before above
+  fuse <<-- kernel [diagonal, label="/dev/osxfuseN EOF"];
+  app <-- fuse [label="fs.Serve returns"];
+
+  app -> fuse [label="conn.Close"];
+  fuse -> kernel [label="close /dev/osxfuseN"];
+  fuse <-- kernel;
+  app <-- fuse;
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-sequence.md

@@ -0,0 +1,30 @@
+# The mount sequence
+
+FUSE mounting is a little bit tricky. There's a userspace helper tool
+that performs the handshake with the kernel, and then steps out of the
+way. This helper behaves differently on different platforms, forcing a
+more complex API on us.
+
+## Successful runs
+
+On Linux, the mount is immediate and file system accesses wait until
+the requests are served.
+
+![Diagram of Linux FUSE mount sequence](mount-linux.seq.png)
+
+On OS X, the mount becomes visible only after `InitRequest` (and maybe
+more) have been served.
+
+![Diagram of OSXFUSE mount sequence](mount-osx.seq.png)
+
+
+## Errors
+
+Let's see what happens if `InitRequest` gets an error response. On
+Linux, the mountpoint is there but all operations will fail:
+
+![Diagram of Linux error handling](mount-linux-error-init.seq.png)
+
+On OS X, the mount never happened:
+
+![Diagram of OS X error handling](mount-osx-error-init.seq.png)

Godeps/_workspace/src/bazil.org/fuse/doc/writing-docs.md

@@ -0,0 +1,16 @@
+# Writing documentation
+
+## Sequence diagrams
+
+The sequence diagrams are generated with `seqdiag`:
+http://blockdiag.com/en/seqdiag/index.html
+
+An easy way to work on them is to automatically update the generated
+files with https://github.com/cespare/reflex :
+
+    reflex -g 'doc/[^.]*.seq' -- seqdiag -T svg -o '{}.svg' '{}' &
+
+    reflex -g 'doc/[^.]*.seq' -- seqdiag -T png -o '{}.png' '{}' &
+
+The markdown files refer to PNG images because of Github limitations,
+but the SVG is generally more pleasant to view.

Godeps/_workspace/src/bazil.org/fuse/error_darwin.go

@@ -0,0 +1,17 @@
+package fuse
+
+import (
+	"syscall"
+)
+
+const (
+	ENOATTR = Errno(syscall.ENOATTR)
+)
+
+const (
+	errNoXattr = ENOATTR
+)
+
+func init() {
+	errnoNames[errNoXattr] = "ENOATTR"
+}

Godeps/_workspace/src/bazil.org/fuse/error_freebsd.go

@@ -0,0 +1,15 @@
+package fuse
+
+import "syscall"
+
+const (
+	ENOATTR = Errno(syscall.ENOATTR)
+)
+
+const (
+	errNoXattr = ENOATTR
+)
+
+func init() {
+	errnoNames[errNoXattr] = "ENOATTR"
+}

Godeps/_workspace/src/bazil.org/fuse/error_linux.go

@@ -0,0 +1,17 @@
+package fuse
+
+import (
+	"syscall"
+)
+
+const (
+	ENODATA = Errno(syscall.ENODATA)
+)
+
+const (
+	errNoXattr = ENODATA
+)
+
+func init() {
+	errnoNames[errNoXattr] = "ENODATA"
+}

Godeps/_workspace/src/bazil.org/fuse/error_std.go

@@ -0,0 +1,31 @@
+package fuse
+
+// There is very little commonality in extended attribute errors
+// across platforms.
+//
+// getxattr return value for "extended attribute does not exist" is
+// ENOATTR on OS X, and ENODATA on Linux and apparently at least
+// NetBSD. There may be a #define ENOATTR on Linux too, but the value
+// is ENODATA in the actual syscalls. FreeBSD and OpenBSD have no
+// ENODATA, only ENOATTR. ENOATTR is not in any of the standards,
+// ENODATA exists but is only used for STREAMs.
+//
+// Each platform will define it a errNoXattr constant, and this file
+// will enforce that it implements the right interfaces and hide the
+// implementation.
+//
+// https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/getxattr.2.html
+// http://mail-index.netbsd.org/tech-kern/2012/04/30/msg013090.html
+// http://mail-index.netbsd.org/tech-kern/2012/04/30/msg013097.html
+// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/errno.h.html
+// http://www.freebsd.org/cgi/man.cgi?query=extattr_get_file&sektion=2
+// http://nixdoc.net/man-pages/openbsd/man2/extattr_get_file.2.html
+
+// ErrNoXattr is a platform-independent error value meaning the
+// extended attribute was not found. It can be used to respond to
+// GetxattrRequest and such.
+const ErrNoXattr = errNoXattr
+
+var _ error = ErrNoXattr
+var _ Errno = ErrNoXattr
+var _ ErrorNumber = ErrNoXattr

Godeps/_workspace/src/bazil.org/fuse/examples/clockfs/clockfs.go

@@ -0,0 +1,173 @@
+// Clockfs implements a file system with the current time in a file.
+// It was written to demonstrate kernel cache invalidation.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"sync/atomic"
+	"syscall"
+	"time"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	_ "bazil.org/fuse/fs/fstestutil"
+	"bazil.org/fuse/fuseutil"
+	"golang.org/x/net/context"
+)
+
+func usage() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "  %s MOUNTPOINT\n", os.Args[0])
+	flag.PrintDefaults()
+}
+
+func main() {
+	flag.Usage = usage
+	flag.Parse()
+
+	if flag.NArg() != 1 {
+		usage()
+		os.Exit(2)
+	}
+	mountpoint := flag.Arg(0)
+
+	c, err := fuse.Mount(
+		mountpoint,
+		fuse.FSName("clock"),
+		fuse.Subtype("clockfsfs"),
+		fuse.LocalVolume(),
+		fuse.VolumeName("Clock filesystem"),
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer c.Close()
+
+	srv := fs.New(c, nil)
+	filesys := &FS{
+		// We pre-create the clock node so that it's always the same
+		// object returned from all the Lookups. You could carefully
+		// track its lifetime between Lookup&Forget, and have the
+		// ticking & invalidation happen only when active, but let's
+		// keep this example simple.
+		clockFile: &File{
+			fuse: srv,
+		},
+	}
+	filesys.clockFile.tick()
+	// This goroutine never exits. That's fine for this example.
+	go filesys.clockFile.update()
+	if err := srv.Serve(filesys); err != nil {
+		log.Fatal(err)
+	}
+
+	// Check if the mount process has an error to report.
+	<-c.Ready
+	if err := c.MountError; err != nil {
+		log.Fatal(err)
+	}
+}
+
+type FS struct {
+	clockFile *File
+}
+
+var _ fs.FS = (*FS)(nil)
+
+func (f *FS) Root() (fs.Node, error) {
+	return &Dir{fs: f}, nil
+}
+
+// Dir implements both Node and Handle for the root directory.
+type Dir struct {
+	fs *FS
+}
+
+var _ fs.Node = (*Dir)(nil)
+
+func (d *Dir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 1
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+var _ fs.NodeStringLookuper = (*Dir)(nil)
+
+func (d *Dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	if name == "clock" {
+		return d.fs.clockFile, nil
+	}
+	return nil, fuse.ENOENT
+}
+
+var dirDirs = []fuse.Dirent{
+	{Inode: 2, Name: "clock", Type: fuse.DT_File},
+}
+
+var _ fs.HandleReadDirAller = (*Dir)(nil)
+
+func (d *Dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	return dirDirs, nil
+}
+
+type File struct {
+	fs.NodeRef
+	fuse    *fs.Server
+	content atomic.Value
+	count   uint64
+}
+
+var _ fs.Node = (*File)(nil)
+
+func (f *File) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 2
+	a.Mode = 0444
+	t := f.content.Load().(string)
+	a.Size = uint64(len(t))
+	return nil
+}
+
+var _ fs.NodeOpener = (*File)(nil)
+
+func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fs.Handle, error) {
+	if !req.Flags.IsReadOnly() {
+		return nil, fuse.Errno(syscall.EACCES)
+	}
+	resp.Flags |= fuse.OpenKeepCache
+	return f, nil
+}
+
+var _ fs.Handle = (*File)(nil)
+
+var _ fs.HandleReader = (*File)(nil)
+
+func (f *File) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
+	t := f.content.Load().(string)
+	fuseutil.HandleRead(req, resp, []byte(t))
+	return nil
+}
+
+func (f *File) tick() {
+	// Intentionally a variable-length format, to demonstrate size changes.
+	f.count++
+	s := fmt.Sprintf("%d\t%s\n", f.count, time.Now())
+	f.content.Store(s)
+
+	// For simplicity, this example tries to send invalidate
+	// notifications even when the kernel does not hold a reference to
+	// the node, so be extra sure to ignore ErrNotCached.
+	if err := f.fuse.InvalidateNodeData(f); err != nil && err != fuse.ErrNotCached {
+		log.Printf("invalidate error: %v", err)
+	}
+}
+
+func (f *File) update() {
+	tick := time.NewTicker(1 * time.Second)
+	defer tick.Stop()
+	for range tick.C {
+		f.tick()
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/examples/hellofs/hello.go

@@ -0,0 +1,101 @@
+// Hellofs implements a simple "hello world" file system.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	_ "bazil.org/fuse/fs/fstestutil"
+	"golang.org/x/net/context"
+)
+
+var Usage = func() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "  %s MOUNTPOINT\n", os.Args[0])
+	flag.PrintDefaults()
+}
+
+func main() {
+	flag.Usage = Usage
+	flag.Parse()
+
+	if flag.NArg() != 1 {
+		Usage()
+		os.Exit(2)
+	}
+	mountpoint := flag.Arg(0)
+
+	c, err := fuse.Mount(
+		mountpoint,
+		fuse.FSName("helloworld"),
+		fuse.Subtype("hellofs"),
+		fuse.LocalVolume(),
+		fuse.VolumeName("Hello world!"),
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer c.Close()
+
+	err = fs.Serve(c, FS{})
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// check if the mount process has an error to report
+	<-c.Ready
+	if err := c.MountError; err != nil {
+		log.Fatal(err)
+	}
+}
+
+// FS implements the hello world file system.
+type FS struct{}
+
+func (FS) Root() (fs.Node, error) {
+	return Dir{}, nil
+}
+
+// Dir implements both Node and Handle for the root directory.
+type Dir struct{}
+
+func (Dir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 1
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+func (Dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	if name == "hello" {
+		return File{}, nil
+	}
+	return nil, fuse.ENOENT
+}
+
+var dirDirs = []fuse.Dirent{
+	{Inode: 2, Name: "hello", Type: fuse.DT_File},
+}
+
+func (Dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	return dirDirs, nil
+}
+
+// File implements both Node and Handle for the hello file.
+type File struct{}
+
+const greeting = "hello, world\n"
+
+func (File) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 2
+	a.Mode = 0444
+	a.Size = uint64(len(greeting))
+	return nil
+}
+
+func (File) ReadAll(ctx context.Context) ([]byte, error) {
+	return []byte(greeting), nil
+}

Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go

@@ -0,0 +1,268 @@
+package bench_test
+
+import (
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+	"testing"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"bazil.org/fuse/fs/fstestutil"
+	"golang.org/x/net/context"
+)
+
+type benchConfig struct {
+	directIO bool
+}
+
+type benchFS struct {
+	conf *benchConfig
+}
+
+var _ = fs.FS(benchFS{})
+
+func (f benchFS) Root() (fs.Node, error) {
+	return benchDir{conf: f.conf}, nil
+}
+
+type benchDir struct {
+	conf *benchConfig
+}
+
+var _ = fs.Node(benchDir{})
+var _ = fs.NodeStringLookuper(benchDir{})
+var _ = fs.Handle(benchDir{})
+var _ = fs.HandleReadDirAller(benchDir{})
+
+func (benchDir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 1
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+func (d benchDir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	if name == "bench" {
+		return benchFile{conf: d.conf}, nil
+	}
+	return nil, fuse.ENOENT
+}
+
+func (benchDir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	l := []fuse.Dirent{
+		{Inode: 2, Name: "bench", Type: fuse.DT_File},
+	}
+	return l, nil
+}
+
+type benchFile struct {
+	conf *benchConfig
+}
+
+var _ = fs.Node(benchFile{})
+var _ = fs.NodeOpener(benchFile{})
+var _ = fs.NodeFsyncer(benchFile{})
+var _ = fs.Handle(benchFile{})
+var _ = fs.HandleReader(benchFile{})
+var _ = fs.HandleWriter(benchFile{})
+
+func (benchFile) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 2
+	a.Mode = 0644
+	a.Size = 9999999999999999
+	return nil
+}
+
+func (f benchFile) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fs.Handle, error) {
+	if f.conf.directIO {
+		resp.Flags |= fuse.OpenDirectIO
+	}
+	// TODO configurable?
+	resp.Flags |= fuse.OpenKeepCache
+	return f, nil
+}
+
+func (benchFile) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
+	resp.Data = resp.Data[:cap(resp.Data)]
+	return nil
+}
+
+func (benchFile) Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error {
+	resp.Size = len(req.Data)
+	return nil
+}
+
+func (benchFile) Fsync(ctx context.Context, req *fuse.FsyncRequest) error {
+	return nil
+}
+
+func benchmark(b *testing.B, fn func(b *testing.B, mnt string), conf *benchConfig) {
+	filesys := benchFS{
+		conf: conf,
+	}
+	mnt, err := fstestutil.Mounted(filesys, nil,
+		fuse.MaxReadahead(64*1024*1024),
+		fuse.AsyncRead(),
+		fuse.WritebackCache(),
+	)
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer mnt.Close()
+
+	fn(b, mnt.Dir)
+}
+
+type zero struct{}
+
+func (zero) Read(p []byte) (n int, err error) {
+	return len(p), nil
+}
+
+var Zero io.Reader = zero{}
+
+func doWrites(size int64) func(b *testing.B, mnt string) {
+	return func(b *testing.B, mnt string) {
+		p := path.Join(mnt, "bench")
+
+		f, err := os.Create(p)
+		if err != nil {
+			b.Fatalf("create: %v", err)
+		}
+		defer f.Close()
+
+		b.ResetTimer()
+		b.SetBytes(size)
+
+		for i := 0; i < b.N; i++ {
+			_, err = io.CopyN(f, Zero, size)
+			if err != nil {
+				b.Fatalf("write: %v", err)
+			}
+		}
+	}
+}
+
+func BenchmarkWrite100(b *testing.B) {
+	benchmark(b, doWrites(100), &benchConfig{})
+}
+
+func BenchmarkWrite10MB(b *testing.B) {
+	benchmark(b, doWrites(10*1024*1024), &benchConfig{})
+}
+
+func BenchmarkWrite100MB(b *testing.B) {
+	benchmark(b, doWrites(100*1024*1024), &benchConfig{})
+}
+
+func BenchmarkDirectWrite100(b *testing.B) {
+	benchmark(b, doWrites(100), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectWrite10MB(b *testing.B) {
+	benchmark(b, doWrites(10*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectWrite100MB(b *testing.B) {
+	benchmark(b, doWrites(100*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}
+
+func doWritesSync(size int64) func(b *testing.B, mnt string) {
+	return func(b *testing.B, mnt string) {
+		p := path.Join(mnt, "bench")
+
+		f, err := os.Create(p)
+		if err != nil {
+			b.Fatalf("create: %v", err)
+		}
+		defer f.Close()
+
+		b.ResetTimer()
+		b.SetBytes(size)
+
+		for i := 0; i < b.N; i++ {
+			_, err = io.CopyN(f, Zero, size)
+			if err != nil {
+				b.Fatalf("write: %v", err)
+			}
+
+			if err := f.Sync(); err != nil {
+				b.Fatalf("sync: %v", err)
+			}
+		}
+	}
+}
+
+func BenchmarkWriteSync100(b *testing.B) {
+	benchmark(b, doWritesSync(100), &benchConfig{})
+}
+
+func BenchmarkWriteSync10MB(b *testing.B) {
+	benchmark(b, doWritesSync(10*1024*1024), &benchConfig{})
+}
+
+func BenchmarkWriteSync100MB(b *testing.B) {
+	benchmark(b, doWritesSync(100*1024*1024), &benchConfig{})
+}
+
+func doReads(size int64) func(b *testing.B, mnt string) {
+	return func(b *testing.B, mnt string) {
+		p := path.Join(mnt, "bench")
+
+		f, err := os.Open(p)
+		if err != nil {
+			b.Fatalf("close: %v", err)
+		}
+		defer f.Close()
+
+		b.ResetTimer()
+		b.SetBytes(size)
+
+		for i := 0; i < b.N; i++ {
+			n, err := io.CopyN(ioutil.Discard, f, size)
+			if err != nil {
+				b.Fatalf("read: %v", err)
+			}
+			if n != size {
+				b.Errorf("unexpected size: %d != %d", n, size)
+			}
+		}
+	}
+}
+
+func BenchmarkRead100(b *testing.B) {
+	benchmark(b, doReads(100), &benchConfig{})
+}
+
+func BenchmarkRead10MB(b *testing.B) {
+	benchmark(b, doReads(10*1024*1024), &benchConfig{})
+}
+
+func BenchmarkRead100MB(b *testing.B) {
+	benchmark(b, doReads(100*1024*1024), &benchConfig{})
+}
+
+func BenchmarkDirectRead100(b *testing.B) {
+	benchmark(b, doReads(100), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectRead10MB(b *testing.B) {
+	benchmark(b, doReads(10*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectRead100MB(b *testing.B) {
+	benchmark(b, doReads(100*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}

Godeps/_workspace/src/bazil.org/fuse/fs/bench/doc.go

@@ -0,0 +1,5 @@
+// Package bench contains benchmarks.
+//
+// It is kept in a separate package to avoid conflicting with the
+// debug-heavy defaults for the actual tests.
+package bench

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/debug.go

@@ -0,0 +1,65 @@
+package fstestutil
+
+import (
+	"flag"
+	"log"
+	"strconv"
+
+	"bazil.org/fuse"
+)
+
+type flagDebug bool
+
+var debug flagDebug
+
+var _ = flag.Value(&debug)
+
+func (f *flagDebug) IsBoolFlag() bool {
+	return true
+}
+
+func nop(msg interface{}) {}
+
+func (f *flagDebug) Set(s string) error {
+	v, err := strconv.ParseBool(s)
+	if err != nil {
+		return err
+	}
+	*f = flagDebug(v)
+	if v {
+		fuse.Debug = logMsg
+	} else {
+		fuse.Debug = nop
+	}
+	return nil
+}
+
+func (f *flagDebug) String() string {
+	return strconv.FormatBool(bool(*f))
+}
+
+func logMsg(msg interface{}) {
+	log.Printf("FUSE: %s\n", msg)
+}
+
+func init() {
+	flag.Var(&debug, "fuse.debug", "log FUSE processing details")
+}
+
+// DebugByDefault changes the default of the `-fuse.debug` flag to
+// true.
+//
+// This package registers a command line flag `-fuse.debug` and when
+// run with that flag (and activated inside the tests), logs FUSE
+// debug messages.
+//
+// This is disabled by default, as most callers probably won't care
+// about FUSE details. Use DebugByDefault for tests where you'd
+// normally be passing `-fuse.debug` all the time anyway.
+//
+// Call from an init function.
+func DebugByDefault() {
+	f := flag.Lookup("fuse.debug")
+	f.DefValue = "true"
+	f.Value.Set(f.DefValue)
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/doc.go

@@ -0,0 +1 @@
+package fstestutil

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mounted.go

@@ -0,0 +1,115 @@
+package fstestutil
+
+import (
+	"errors"
+	"io/ioutil"
+	"log"
+	"os"
+	"testing"
+	"time"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+)
+
+// Mount contains information about the mount for the test to use.
+type Mount struct {
+	// Dir is the temporary directory where the filesystem is mounted.
+	Dir string
+
+	Conn   *fuse.Conn
+	Server *fs.Server
+
+	// Error will receive the return value of Serve.
+	Error <-chan error
+
+	done   <-chan struct{}
+	closed bool
+}
+
+// Close unmounts the filesystem and waits for fs.Serve to return. Any
+// returned error will be stored in Err. It is safe to call Close
+// multiple times.
+func (mnt *Mount) Close() {
+	if mnt.closed {
+		return
+	}
+	mnt.closed = true
+	for tries := 0; tries < 1000; tries++ {
+		err := fuse.Unmount(mnt.Dir)
+		if err != nil {
+			// TODO do more than log?
+			log.Printf("unmount error: %v", err)
+			time.Sleep(10 * time.Millisecond)
+			continue
+		}
+		break
+	}
+	<-mnt.done
+	mnt.Conn.Close()
+	os.Remove(mnt.Dir)
+}
+
+// Mounted mounts the fuse.Server at a temporary directory.
+//
+// It also waits until the filesystem is known to be visible (OS X
+// workaround).
+//
+// After successful return, caller must clean up by calling Close.
+func Mounted(filesys fs.FS, conf *fs.Config, options ...fuse.MountOption) (*Mount, error) {
+	dir, err := ioutil.TempDir("", "fusetest")
+	if err != nil {
+		return nil, err
+	}
+	c, err := fuse.Mount(dir, options...)
+	if err != nil {
+		return nil, err
+	}
+	server := fs.New(c, conf)
+	done := make(chan struct{})
+	serveErr := make(chan error, 1)
+	mnt := &Mount{
+		Dir:    dir,
+		Conn:   c,
+		Server: server,
+		Error:  serveErr,
+		done:   done,
+	}
+	go func() {
+		defer close(done)
+		serveErr <- server.Serve(filesys)
+	}()
+
+	select {
+	case <-mnt.Conn.Ready:
+		if err := mnt.Conn.MountError; err != nil {
+			return nil, err
+		}
+		return mnt, nil
+	case err = <-mnt.Error:
+		// Serve quit early
+		if err != nil {
+			return nil, err
+		}
+		return nil, errors.New("Serve exited early")
+	}
+}
+
+// MountedT mounts the filesystem at a temporary directory,
+// directing it's debug log to the testing logger.
+//
+// See Mounted for usage.
+//
+// The debug log is not enabled by default. Use `-fuse.debug` or call
+// DebugByDefault to enable.
+func MountedT(t testing.TB, filesys fs.FS, conf *fs.Config, options ...fuse.MountOption) (*Mount, error) {
+	if conf == nil {
+		conf = &fs.Config{}
+	}
+	if debug && conf.Debug == nil {
+		conf.Debug = func(msg interface{}) {
+			t.Logf("FUSE: %s", msg)
+		}
+	}
+	return Mounted(filesys, conf, options...)
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo.go

@@ -0,0 +1,26 @@
+package fstestutil
+
+// MountInfo describes a mounted file system.
+type MountInfo struct {
+	FSName string
+	Type   string
+}
+
+// GetMountInfo finds information about the mount at mnt. It is
+// intended for use by tests only, and only fetches information
+// relevant to the current tests.
+func GetMountInfo(mnt string) (*MountInfo, error) {
+	return getMountInfo(mnt)
+}
+
+// cstr converts a nil-terminated C string into a Go string
+func cstr(ca []int8) string {
+	s := make([]byte, 0, len(ca))
+	for _, c := range ca {
+		if c == 0x00 {
+			break
+		}
+		s = append(s, byte(c))
+	}
+	return string(s)
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_darwin.go

@@ -0,0 +1,29 @@
+package fstestutil
+
+import (
+	"regexp"
+	"syscall"
+)
+
+var re = regexp.MustCompile(`\\(.)`)
+
+// unescape removes backslash-escaping. The escaped characters are not
+// mapped in any way; that is, unescape(`\n` ) == `n`.
+func unescape(s string) string {
+	return re.ReplaceAllString(s, `$1`)
+}
+
+func getMountInfo(mnt string) (*MountInfo, error) {
+	var st syscall.Statfs_t
+	err := syscall.Statfs(mnt, &st)
+	if err != nil {
+		return nil, err
+	}
+	i := &MountInfo{
+		// osx getmntent(3) fails to un-escape the data, so we do it..
+		// this might lead to double-unescaping in the future. fun.
+		// TestMountOptionFSNameEvilBackslashDouble checks for that.
+		FSName: unescape(cstr(st.Mntfromname[:])),
+	}
+	return i, nil
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_freebsd.go

@@ -0,0 +1,7 @@
+package fstestutil
+
+import "errors"
+
+func getMountInfo(mnt string) (*MountInfo, error) {
+	return nil, errors.New("FreeBSD has no useful mount information")
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_linux.go

@@ -0,0 +1,51 @@
+package fstestutil
+
+import (
+	"errors"
+	"io/ioutil"
+	"strings"
+)
+
+// Linux /proc/mounts shows current mounts.
+// Same format as /etc/fstab. Quoting getmntent(3):
+//
+// Since fields in the mtab and fstab files are separated by whitespace,
+// octal escapes are used to represent the four characters space (\040),
+// tab (\011), newline (\012) and backslash (\134) in those files when
+// they occur in one of the four strings in a mntent structure.
+//
+// http://linux.die.net/man/3/getmntent
+
+var fstabUnescape = strings.NewReplacer(
+	`\040`, "\040",
+	`\011`, "\011",
+	`\012`, "\012",
+	`\134`, "\134",
+)
+
+var errNotFound = errors.New("mount not found")
+
+func getMountInfo(mnt string) (*MountInfo, error) {
+	data, err := ioutil.ReadFile("/proc/mounts")
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range strings.Split(string(data), "\n") {
+		fields := strings.Fields(line)
+		if len(fields) < 3 {
+			continue
+		}
+		// Fields are: fsname dir type opts freq passno
+		fsname := fstabUnescape.Replace(fields[0])
+		dir := fstabUnescape.Replace(fields[1])
+		fstype := fstabUnescape.Replace(fields[2])
+		if mnt == dir {
+			info := &MountInfo{
+				FSName: fsname,
+				Type:   fstype,
+			}
+			return info, nil
+		}
+	}
+	return nil, errNotFound
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/buffer.go

@@ -0,0 +1,28 @@
+package record
+
+import (
+	"bytes"
+	"io"
+	"sync"
+)
+
+// Buffer is like bytes.Buffer but safe to access from multiple
+// goroutines.
+type Buffer struct {
+	mu  sync.Mutex
+	buf bytes.Buffer
+}
+
+var _ = io.Writer(&Buffer{})
+
+func (b *Buffer) Write(p []byte) (n int, err error) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	return b.buf.Write(p)
+}
+
+func (b *Buffer) Bytes() []byte {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	return b.buf.Bytes()
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go

@@ -0,0 +1,384 @@
+package record
+
+import (
+	"sync"
+	"sync/atomic"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+)
+
+// Writes gathers data from FUSE Write calls.
+type Writes struct {
+	buf Buffer
+}
+
+var _ = fs.HandleWriter(&Writes{})
+
+func (w *Writes) Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error {
+	n, err := w.buf.Write(req.Data)
+	resp.Size = n
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *Writes) RecordedWriteData() []byte {
+	return w.buf.Bytes()
+}
+
+// Counter records number of times a thing has occurred.
+type Counter struct {
+	count uint32
+}
+
+func (r *Counter) Inc() {
+	atomic.AddUint32(&r.count, 1)
+}
+
+func (r *Counter) Count() uint32 {
+	return atomic.LoadUint32(&r.count)
+}
+
+// MarkRecorder records whether a thing has occurred.
+type MarkRecorder struct {
+	count Counter
+}
+
+func (r *MarkRecorder) Mark() {
+	r.count.Inc()
+}
+
+func (r *MarkRecorder) Recorded() bool {
+	return r.count.Count() > 0
+}
+
+// Flushes notes whether a FUSE Flush call has been seen.
+type Flushes struct {
+	rec MarkRecorder
+}
+
+var _ = fs.HandleFlusher(&Flushes{})
+
+func (r *Flushes) Flush(ctx context.Context, req *fuse.FlushRequest) error {
+	r.rec.Mark()
+	return nil
+}
+
+func (r *Flushes) RecordedFlush() bool {
+	return r.rec.Recorded()
+}
+
+type Recorder struct {
+	mu  sync.Mutex
+	val interface{}
+}
+
+// Record that we've seen value. A nil value is indistinguishable from
+// no value recorded.
+func (r *Recorder) Record(value interface{}) {
+	r.mu.Lock()
+	r.val = value
+	r.mu.Unlock()
+}
+
+func (r *Recorder) Recorded() interface{} {
+	r.mu.Lock()
+	val := r.val
+	r.mu.Unlock()
+	return val
+}
+
+type RequestRecorder struct {
+	rec Recorder
+}
+
+// Record a fuse.Request, after zeroing header fields that are hard to
+// reproduce.
+//
+// Make sure to record a copy, not the original request.
+func (r *RequestRecorder) RecordRequest(req fuse.Request) {
+	hdr := req.Hdr()
+	*hdr = fuse.Header{}
+	r.rec.Record(req)
+}
+
+func (r *RequestRecorder) Recorded() fuse.Request {
+	val := r.rec.Recorded()
+	if val == nil {
+		return nil
+	}
+	return val.(fuse.Request)
+}
+
+// Setattrs records a Setattr request and its fields.
+type Setattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeSetattrer(&Setattrs{})
+
+func (r *Setattrs) Setattr(ctx context.Context, req *fuse.SetattrRequest, resp *fuse.SetattrResponse) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+func (r *Setattrs) RecordedSetattr() fuse.SetattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.SetattrRequest{}
+	}
+	return *(val.(*fuse.SetattrRequest))
+}
+
+// Fsyncs records an Fsync request and its fields.
+type Fsyncs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeFsyncer(&Fsyncs{})
+
+func (r *Fsyncs) Fsync(ctx context.Context, req *fuse.FsyncRequest) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+func (r *Fsyncs) RecordedFsync() fuse.FsyncRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.FsyncRequest{}
+	}
+	return *(val.(*fuse.FsyncRequest))
+}
+
+// Mkdirs records a Mkdir request and its fields.
+type Mkdirs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeMkdirer(&Mkdirs{})
+
+// Mkdir records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Mkdirs) Mkdir(ctx context.Context, req *fuse.MkdirRequest) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedMkdir returns information about the Mkdir request.
+// If no request was seen, returns a zero value.
+func (r *Mkdirs) RecordedMkdir() fuse.MkdirRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.MkdirRequest{}
+	}
+	return *(val.(*fuse.MkdirRequest))
+}
+
+// Symlinks records a Symlink request and its fields.
+type Symlinks struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeSymlinker(&Symlinks{})
+
+// Symlink records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Symlinks) Symlink(ctx context.Context, req *fuse.SymlinkRequest) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedSymlink returns information about the Symlink request.
+// If no request was seen, returns a zero value.
+func (r *Symlinks) RecordedSymlink() fuse.SymlinkRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.SymlinkRequest{}
+	}
+	return *(val.(*fuse.SymlinkRequest))
+}
+
+// Links records a Link request and its fields.
+type Links struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeLinker(&Links{})
+
+// Link records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Links) Link(ctx context.Context, req *fuse.LinkRequest, old fs.Node) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedLink returns information about the Link request.
+// If no request was seen, returns a zero value.
+func (r *Links) RecordedLink() fuse.LinkRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.LinkRequest{}
+	}
+	return *(val.(*fuse.LinkRequest))
+}
+
+// Mknods records a Mknod request and its fields.
+type Mknods struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeMknoder(&Mknods{})
+
+// Mknod records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Mknods) Mknod(ctx context.Context, req *fuse.MknodRequest) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedMknod returns information about the Mknod request.
+// If no request was seen, returns a zero value.
+func (r *Mknods) RecordedMknod() fuse.MknodRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.MknodRequest{}
+	}
+	return *(val.(*fuse.MknodRequest))
+}
+
+// Opens records a Open request and its fields.
+type Opens struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeOpener(&Opens{})
+
+// Open records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Opens) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fs.Handle, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedOpen returns information about the Open request.
+// If no request was seen, returns a zero value.
+func (r *Opens) RecordedOpen() fuse.OpenRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.OpenRequest{}
+	}
+	return *(val.(*fuse.OpenRequest))
+}
+
+// Getxattrs records a Getxattr request and its fields.
+type Getxattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeGetxattrer(&Getxattrs{})
+
+// Getxattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Getxattrs) Getxattr(ctx context.Context, req *fuse.GetxattrRequest, resp *fuse.GetxattrResponse) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return fuse.ErrNoXattr
+}
+
+// RecordedGetxattr returns information about the Getxattr request.
+// If no request was seen, returns a zero value.
+func (r *Getxattrs) RecordedGetxattr() fuse.GetxattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.GetxattrRequest{}
+	}
+	return *(val.(*fuse.GetxattrRequest))
+}
+
+// Listxattrs records a Listxattr request and its fields.
+type Listxattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeListxattrer(&Listxattrs{})
+
+// Listxattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Listxattrs) Listxattr(ctx context.Context, req *fuse.ListxattrRequest, resp *fuse.ListxattrResponse) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return fuse.ErrNoXattr
+}
+
+// RecordedListxattr returns information about the Listxattr request.
+// If no request was seen, returns a zero value.
+func (r *Listxattrs) RecordedListxattr() fuse.ListxattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.ListxattrRequest{}
+	}
+	return *(val.(*fuse.ListxattrRequest))
+}
+
+// Setxattrs records a Setxattr request and its fields.
+type Setxattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeSetxattrer(&Setxattrs{})
+
+// Setxattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Setxattrs) Setxattr(ctx context.Context, req *fuse.SetxattrRequest) error {
+	tmp := *req
+	// The byte slice points to memory that will be reused, so make a
+	// deep copy.
+	tmp.Xattr = append([]byte(nil), req.Xattr...)
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+// RecordedSetxattr returns information about the Setxattr request.
+// If no request was seen, returns a zero value.
+func (r *Setxattrs) RecordedSetxattr() fuse.SetxattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.SetxattrRequest{}
+	}
+	return *(val.(*fuse.SetxattrRequest))
+}
+
+// Removexattrs records a Removexattr request and its fields.
+type Removexattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeRemovexattrer(&Removexattrs{})
+
+// Removexattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Removexattrs) Removexattr(ctx context.Context, req *fuse.RemovexattrRequest) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+// RecordedRemovexattr returns information about the Removexattr request.
+// If no request was seen, returns a zero value.
+func (r *Removexattrs) RecordedRemovexattr() fuse.RemovexattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.RemovexattrRequest{}
+	}
+	return *(val.(*fuse.RemovexattrRequest))
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go

@@ -0,0 +1,55 @@
+package record
+
+import (
+	"sync"
+	"time"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+)
+
+type nothing struct{}
+
+// ReleaseWaiter notes whether a FUSE Release call has been seen.
+//
+// Releases are not guaranteed to happen synchronously with any client
+// call, so they must be waited for.
+type ReleaseWaiter struct {
+	once sync.Once
+	seen chan nothing
+}
+
+var _ = fs.HandleReleaser(&ReleaseWaiter{})
+
+func (r *ReleaseWaiter) init() {
+	r.once.Do(func() {
+		r.seen = make(chan nothing, 1)
+	})
+}
+
+func (r *ReleaseWaiter) Release(ctx context.Context, req *fuse.ReleaseRequest) error {
+	r.init()
+	close(r.seen)
+	return nil
+}
+
+// WaitForRelease waits for Release to be called.
+//
+// With zero duration, wait forever. Otherwise, timeout early
+// in a more controller way than `-test.timeout`.
+//
+// Returns whether a Release was seen. Always true if dur==0.
+func (r *ReleaseWaiter) WaitForRelease(dur time.Duration) bool {
+	r.init()
+	var timeout <-chan time.Time
+	if dur > 0 {
+		timeout = time.After(dur)
+	}
+	select {
+	case <-r.seen:
+		return true
+	case <-timeout:
+		return false
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go

@@ -0,0 +1,55 @@
+package fstestutil
+
+import (
+	"os"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+)
+
+// SimpleFS is a trivial FS that just implements the Root method.
+type SimpleFS struct {
+	Node fs.Node
+}
+
+var _ = fs.FS(SimpleFS{})
+
+func (f SimpleFS) Root() (fs.Node, error) {
+	return f.Node, nil
+}
+
+// File can be embedded in a struct to make it look like a file.
+type File struct{}
+
+func (f File) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = 0666
+	return nil
+}
+
+// Dir can be embedded in a struct to make it look like a directory.
+type Dir struct{}
+
+func (f Dir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = os.ModeDir | 0777
+	return nil
+}
+
+// ChildMap is a directory with child nodes looked up from a map.
+type ChildMap map[string]fs.Node
+
+var _ = fs.Node(&ChildMap{})
+var _ = fs.NodeStringLookuper(&ChildMap{})
+
+func (f *ChildMap) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = os.ModeDir | 0777
+	return nil
+}
+
+func (f *ChildMap) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	child, ok := (*f)[name]
+	if !ok {
+		return nil, fuse.ENOENT
+	}
+	return child, nil
+}

Godeps/_workspace/src/bazil.org/fuse/fs/helpers_test.go

@@ -0,0 +1,67 @@
+package fs_test
+
+import (
+	"errors"
+	"flag"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+)
+
+var childHelpers = map[string]func(){}
+
+type childProcess struct {
+	name string
+	fn   func()
+}
+
+var _ flag.Value = (*childProcess)(nil)
+
+func (c *childProcess) String() string {
+	return c.name
+}
+
+func (c *childProcess) Set(s string) error {
+	fn, ok := childHelpers[s]
+	if !ok {
+		return errors.New("helper not found")
+	}
+	c.name = s
+	c.fn = fn
+	return nil
+}
+
+var childMode childProcess
+
+func init() {
+	flag.Var(&childMode, "fuse.internal.child", "internal use only")
+}
+
+// childCmd prepares a test function to be run in a subprocess, with
+// childMode set to true. Caller must still call Run or Start.
+//
+// Re-using the test executable as the subprocess is useful because
+// now test executables can e.g. be cross-compiled, transferred
+// between hosts, and run in settings where the whole Go development
+// environment is not installed.
+func childCmd(childName string) (*exec.Cmd, error) {
+	// caller may set cwd, so we can't rely on relative paths
+	executable, err := filepath.Abs(os.Args[0])
+	if err != nil {
+		return nil, err
+	}
+	cmd := exec.Command(executable, "-fuse.internal.child="+childName)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd, nil
+}
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	if childMode.fn != nil {
+		childMode.fn()
+		os.Exit(0)
+	}
+	os.Exit(m.Run())
+}

Godeps/_workspace/src/bazil.org/fuse/fs/tree.go

@@ -0,0 +1,99 @@
+// FUSE directory tree, for servers that wish to use it with the service loop.
+
+package fs
+
+import (
+	"os"
+	pathpkg "path"
+	"strings"
+
+	"golang.org/x/net/context"
+)
+
+import (
+	"bazil.org/fuse"
+)
+
+// A Tree implements a basic read-only directory tree for FUSE.
+// The Nodes contained in it may still be writable.
+type Tree struct {
+	tree
+}
+
+func (t *Tree) Root() (Node, error) {
+	return &t.tree, nil
+}
+
+// Add adds the path to the tree, resolving to the given node.
+// If path or a prefix of path has already been added to the tree,
+// Add panics.
+//
+// Add is only safe to call before starting to serve requests.
+func (t *Tree) Add(path string, node Node) {
+	path = pathpkg.Clean("/" + path)[1:]
+	elems := strings.Split(path, "/")
+	dir := Node(&t.tree)
+	for i, elem := range elems {
+		dt, ok := dir.(*tree)
+		if !ok {
+			panic("fuse: Tree.Add for " + strings.Join(elems[:i], "/") + " and " + path)
+		}
+		n := dt.lookup(elem)
+		if n != nil {
+			if i+1 == len(elems) {
+				panic("fuse: Tree.Add for " + path + " conflicts with " + elem)
+			}
+			dir = n
+		} else {
+			if i+1 == len(elems) {
+				dt.add(elem, node)
+			} else {
+				dir = &tree{}
+				dt.add(elem, dir)
+			}
+		}
+	}
+}
+
+type treeDir struct {
+	name string
+	node Node
+}
+
+type tree struct {
+	dir []treeDir
+}
+
+func (t *tree) lookup(name string) Node {
+	for _, d := range t.dir {
+		if d.name == name {
+			return d.node
+		}
+	}
+	return nil
+}
+
+func (t *tree) add(name string, n Node) {
+	t.dir = append(t.dir, treeDir{name, n})
+}
+
+func (t *tree) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+func (t *tree) Lookup(ctx context.Context, name string) (Node, error) {
+	n := t.lookup(name)
+	if n != nil {
+		return n, nil
+	}
+	return nil, fuse.ENOENT
+}
+
+func (t *tree) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	var out []fuse.Dirent
+	for _, d := range t.dir {
+		out = append(out, fuse.Dirent{Name: d.name})
+	}
+	return out, nil
+}

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel.go

@@ -0,0 +1,766 @@
+// See the file LICENSE for copyright and licensing information.
+
+// Derived from FUSE's fuse_kernel.h, which carries this notice:
+/*
+   This file defines the kernel interface of FUSE
+   Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
+
+
+   This -- and only this -- header file may also be distributed under
+   the terms of the BSD Licence as follows:
+
+   Copyright (C) 2001-2007 Miklos Szeredi. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+*/
+
+package fuse
+
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+// The FUSE version implemented by the package.
+const (
+	protoVersionMinMajor = 7
+	protoVersionMinMinor = 8
+	protoVersionMaxMajor = 7
+	protoVersionMaxMinor = 12
+)
+
+const (
+	rootID = 1
+)
+
+type kstatfs struct {
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Bsize   uint32
+	Namelen uint32
+	Frsize  uint32
+	Padding uint32
+	Spare   [6]uint32
+}
+
+type fileLock struct {
+	Start uint64
+	End   uint64
+	Type  uint32
+	Pid   uint32
+}
+
+// GetattrFlags are bit flags that can be seen in GetattrRequest.
+type GetattrFlags uint32
+
+const (
+	// Indicates the handle is valid.
+	GetattrFh GetattrFlags = 1 << 0
+)
+
+var getattrFlagsNames = []flagName{
+	{uint32(GetattrFh), "GetattrFh"},
+}
+
+func (fl GetattrFlags) String() string {
+	return flagString(uint32(fl), getattrFlagsNames)
+}
+
+// The SetattrValid are bit flags describing which fields in the SetattrRequest
+// are included in the change.
+type SetattrValid uint32
+
+const (
+	SetattrMode   SetattrValid = 1 << 0
+	SetattrUid    SetattrValid = 1 << 1
+	SetattrGid    SetattrValid = 1 << 2
+	SetattrSize   SetattrValid = 1 << 3
+	SetattrAtime  SetattrValid = 1 << 4
+	SetattrMtime  SetattrValid = 1 << 5
+	SetattrHandle SetattrValid = 1 << 6
+
+	// Linux only(?)
+	SetattrAtimeNow  SetattrValid = 1 << 7
+	SetattrMtimeNow  SetattrValid = 1 << 8
+	SetattrLockOwner SetattrValid = 1 << 9 // http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg27852.html
+
+	// OS X only
+	SetattrCrtime   SetattrValid = 1 << 28
+	SetattrChgtime  SetattrValid = 1 << 29
+	SetattrBkuptime SetattrValid = 1 << 30
+	SetattrFlags    SetattrValid = 1 << 31
+)
+
+func (fl SetattrValid) Mode() bool      { return fl&SetattrMode != 0 }
+func (fl SetattrValid) Uid() bool       { return fl&SetattrUid != 0 }
+func (fl SetattrValid) Gid() bool       { return fl&SetattrGid != 0 }
+func (fl SetattrValid) Size() bool      { return fl&SetattrSize != 0 }
+func (fl SetattrValid) Atime() bool     { return fl&SetattrAtime != 0 }
+func (fl SetattrValid) Mtime() bool     { return fl&SetattrMtime != 0 }
+func (fl SetattrValid) Handle() bool    { return fl&SetattrHandle != 0 }
+func (fl SetattrValid) AtimeNow() bool  { return fl&SetattrAtimeNow != 0 }
+func (fl SetattrValid) MtimeNow() bool  { return fl&SetattrMtimeNow != 0 }
+func (fl SetattrValid) LockOwner() bool { return fl&SetattrLockOwner != 0 }
+func (fl SetattrValid) Crtime() bool    { return fl&SetattrCrtime != 0 }
+func (fl SetattrValid) Chgtime() bool   { return fl&SetattrChgtime != 0 }
+func (fl SetattrValid) Bkuptime() bool  { return fl&SetattrBkuptime != 0 }
+func (fl SetattrValid) Flags() bool     { return fl&SetattrFlags != 0 }
+
+func (fl SetattrValid) String() string {
+	return flagString(uint32(fl), setattrValidNames)
+}
+
+var setattrValidNames = []flagName{
+	{uint32(SetattrMode), "SetattrMode"},
+	{uint32(SetattrUid), "SetattrUid"},
+	{uint32(SetattrGid), "SetattrGid"},
+	{uint32(SetattrSize), "SetattrSize"},
+	{uint32(SetattrAtime), "SetattrAtime"},
+	{uint32(SetattrMtime), "SetattrMtime"},
+	{uint32(SetattrHandle), "SetattrHandle"},
+	{uint32(SetattrAtimeNow), "SetattrAtimeNow"},
+	{uint32(SetattrMtimeNow), "SetattrMtimeNow"},
+	{uint32(SetattrLockOwner), "SetattrLockOwner"},
+	{uint32(SetattrCrtime), "SetattrCrtime"},
+	{uint32(SetattrChgtime), "SetattrChgtime"},
+	{uint32(SetattrBkuptime), "SetattrBkuptime"},
+	{uint32(SetattrFlags), "SetattrFlags"},
+}
+
+// Flags that can be seen in OpenRequest.Flags.
+const (
+	// Access modes. These are not 1-bit flags, but alternatives where
+	// only one can be chosen. See the IsReadOnly etc convenience
+	// methods.
+	OpenReadOnly  OpenFlags = syscall.O_RDONLY
+	OpenWriteOnly OpenFlags = syscall.O_WRONLY
+	OpenReadWrite OpenFlags = syscall.O_RDWR
+
+	OpenAppend    OpenFlags = syscall.O_APPEND
+	OpenCreate    OpenFlags = syscall.O_CREAT
+	OpenExclusive OpenFlags = syscall.O_EXCL
+	OpenSync      OpenFlags = syscall.O_SYNC
+	OpenTruncate  OpenFlags = syscall.O_TRUNC
+)
+
+// OpenAccessModeMask is a bitmask that separates the access mode
+// from the other flags in OpenFlags.
+const OpenAccessModeMask OpenFlags = syscall.O_ACCMODE
+
+// OpenFlags are the O_FOO flags passed to open/create/etc calls. For
+// example, os.O_WRONLY | os.O_APPEND.
+type OpenFlags uint32
+
+func (fl OpenFlags) String() string {
+	// O_RDONLY, O_RWONLY, O_RDWR are not flags
+	s := accModeName(fl & OpenAccessModeMask)
+	flags := uint32(fl &^ OpenAccessModeMask)
+	if flags != 0 {
+		s = s + "+" + flagString(flags, openFlagNames)
+	}
+	return s
+}
+
+// Return true if OpenReadOnly is set.
+func (fl OpenFlags) IsReadOnly() bool {
+	return fl&OpenAccessModeMask == OpenReadOnly
+}
+
+// Return true if OpenWriteOnly is set.
+func (fl OpenFlags) IsWriteOnly() bool {
+	return fl&OpenAccessModeMask == OpenWriteOnly
+}
+
+// Return true if OpenReadWrite is set.
+func (fl OpenFlags) IsReadWrite() bool {
+	return fl&OpenAccessModeMask == OpenReadWrite
+}
+
+func accModeName(flags OpenFlags) string {
+	switch flags {
+	case OpenReadOnly:
+		return "OpenReadOnly"
+	case OpenWriteOnly:
+		return "OpenWriteOnly"
+	case OpenReadWrite:
+		return "OpenReadWrite"
+	default:
+		return ""
+	}
+}
+
+var openFlagNames = []flagName{
+	{uint32(OpenCreate), "OpenCreate"},
+	{uint32(OpenExclusive), "OpenExclusive"},
+	{uint32(OpenTruncate), "OpenTruncate"},
+	{uint32(OpenAppend), "OpenAppend"},
+	{uint32(OpenSync), "OpenSync"},
+}
+
+// The OpenResponseFlags are returned in the OpenResponse.
+type OpenResponseFlags uint32
+
+const (
+	OpenDirectIO    OpenResponseFlags = 1 << 0 // bypass page cache for this open file
+	OpenKeepCache   OpenResponseFlags = 1 << 1 // don't invalidate the data cache on open
+	OpenNonSeekable OpenResponseFlags = 1 << 2 // mark the file as non-seekable (not supported on OS X)
+
+	OpenPurgeAttr OpenResponseFlags = 1 << 30 // OS X
+	OpenPurgeUBC  OpenResponseFlags = 1 << 31 // OS X
+)
+
+func (fl OpenResponseFlags) String() string {
+	return flagString(uint32(fl), openResponseFlagNames)
+}
+
+var openResponseFlagNames = []flagName{
+	{uint32(OpenDirectIO), "OpenDirectIO"},
+	{uint32(OpenKeepCache), "OpenKeepCache"},
+	{uint32(OpenNonSeekable), "OpenNonSeekable"},
+	{uint32(OpenPurgeAttr), "OpenPurgeAttr"},
+	{uint32(OpenPurgeUBC), "OpenPurgeUBC"},
+}
+
+// The InitFlags are used in the Init exchange.
+type InitFlags uint32
+
+const (
+	InitAsyncRead       InitFlags = 1 << 0
+	InitPosixLocks      InitFlags = 1 << 1
+	InitFileOps         InitFlags = 1 << 2
+	InitAtomicTrunc     InitFlags = 1 << 3
+	InitExportSupport   InitFlags = 1 << 4
+	InitBigWrites       InitFlags = 1 << 5
+	InitDontMask        InitFlags = 1 << 6
+	InitSpliceWrite     InitFlags = 1 << 7
+	InitSpliceMove      InitFlags = 1 << 8
+	InitSpliceRead      InitFlags = 1 << 9
+	InitFlockLocks      InitFlags = 1 << 10
+	InitHasIoctlDir     InitFlags = 1 << 11
+	InitAutoInvalData   InitFlags = 1 << 12
+	InitDoReaddirplus   InitFlags = 1 << 13
+	InitReaddirplusAuto InitFlags = 1 << 14
+	InitAsyncDIO        InitFlags = 1 << 15
+	InitWritebackCache  InitFlags = 1 << 16
+	InitNoOpenSupport   InitFlags = 1 << 17
+
+	InitCaseSensitive InitFlags = 1 << 29 // OS X only
+	InitVolRename     InitFlags = 1 << 30 // OS X only
+	InitXtimes        InitFlags = 1 << 31 // OS X only
+)
+
+type flagName struct {
+	bit  uint32
+	name string
+}
+
+var initFlagNames = []flagName{
+	{uint32(InitAsyncRead), "InitAsyncRead"},
+	{uint32(InitPosixLocks), "InitPosixLocks"},
+	{uint32(InitFileOps), "InitFileOps"},
+	{uint32(InitAtomicTrunc), "InitAtomicTrunc"},
+	{uint32(InitExportSupport), "InitExportSupport"},
+	{uint32(InitBigWrites), "InitBigWrites"},
+	{uint32(InitDontMask), "InitDontMask"},
+	{uint32(InitSpliceWrite), "InitSpliceWrite"},
+	{uint32(InitSpliceMove), "InitSpliceMove"},
+	{uint32(InitSpliceRead), "InitSpliceRead"},
+	{uint32(InitFlockLocks), "InitFlockLocks"},
+	{uint32(InitHasIoctlDir), "InitHasIoctlDir"},
+	{uint32(InitAutoInvalData), "InitAutoInvalData"},
+	{uint32(InitDoReaddirplus), "InitDoReaddirplus"},
+	{uint32(InitReaddirplusAuto), "InitReaddirplusAuto"},
+	{uint32(InitAsyncDIO), "InitAsyncDIO"},
+	{uint32(InitWritebackCache), "InitWritebackCache"},
+	{uint32(InitNoOpenSupport), "InitNoOpenSupport"},
+
+	{uint32(InitCaseSensitive), "InitCaseSensitive"},
+	{uint32(InitVolRename), "InitVolRename"},
+	{uint32(InitXtimes), "InitXtimes"},
+}
+
+func (fl InitFlags) String() string {
+	return flagString(uint32(fl), initFlagNames)
+}
+
+func flagString(f uint32, names []flagName) string {
+	var s string
+
+	if f == 0 {
+		return "0"
+	}
+
+	for _, n := range names {
+		if f&n.bit != 0 {
+			s += "+" + n.name
+			f &^= n.bit
+		}
+	}
+	if f != 0 {
+		s += fmt.Sprintf("%+#x", f)
+	}
+	return s[1:]
+}
+
+// The ReleaseFlags are used in the Release exchange.
+type ReleaseFlags uint32
+
+const (
+	ReleaseFlush ReleaseFlags = 1 << 0
+)
+
+func (fl ReleaseFlags) String() string {
+	return flagString(uint32(fl), releaseFlagNames)
+}
+
+var releaseFlagNames = []flagName{
+	{uint32(ReleaseFlush), "ReleaseFlush"},
+}
+
+// Opcodes
+const (
+	opLookup      = 1
+	opForget      = 2 // no reply
+	opGetattr     = 3
+	opSetattr     = 4
+	opReadlink    = 5
+	opSymlink     = 6
+	opMknod       = 8
+	opMkdir       = 9
+	opUnlink      = 10
+	opRmdir       = 11
+	opRename      = 12
+	opLink        = 13
+	opOpen        = 14
+	opRead        = 15
+	opWrite       = 16
+	opStatfs      = 17
+	opRelease     = 18
+	opFsync       = 20
+	opSetxattr    = 21
+	opGetxattr    = 22
+	opListxattr   = 23
+	opRemovexattr = 24
+	opFlush       = 25
+	opInit        = 26
+	opOpendir     = 27
+	opReaddir     = 28
+	opReleasedir  = 29
+	opFsyncdir    = 30
+	opGetlk       = 31
+	opSetlk       = 32
+	opSetlkw      = 33
+	opAccess      = 34
+	opCreate      = 35
+	opInterrupt   = 36
+	opBmap        = 37
+	opDestroy     = 38
+	opIoctl       = 39 // Linux?
+	opPoll        = 40 // Linux?
+
+	// OS X
+	opSetvolname = 61
+	opGetxtimes  = 62
+	opExchange   = 63
+)
+
+type entryOut struct {
+	Nodeid         uint64 // Inode ID
+	Generation     uint64 // Inode generation
+	EntryValid     uint64 // Cache timeout for the name
+	AttrValid      uint64 // Cache timeout for the attributes
+	EntryValidNsec uint32
+	AttrValidNsec  uint32
+	Attr           attr
+}
+
+func entryOutSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 9}):
+		return unsafe.Offsetof(entryOut{}.Attr) + unsafe.Offsetof(entryOut{}.Attr.Blksize)
+	default:
+		return unsafe.Sizeof(entryOut{})
+	}
+}
+
+type forgetIn struct {
+	Nlookup uint64
+}
+
+type getattrIn struct {
+	GetattrFlags uint32
+	dummy        uint32
+	Fh           uint64
+}
+
+type attrOut struct {
+	AttrValid     uint64 // Cache timeout for the attributes
+	AttrValidNsec uint32
+	Dummy         uint32
+	Attr          attr
+}
+
+func attrOutSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 9}):
+		return unsafe.Offsetof(attrOut{}.Attr) + unsafe.Offsetof(attrOut{}.Attr.Blksize)
+	default:
+		return unsafe.Sizeof(attrOut{})
+	}
+}
+
+// OS X
+type getxtimesOut struct {
+	Bkuptime     uint64
+	Crtime       uint64
+	BkuptimeNsec uint32
+	CrtimeNsec   uint32
+}
+
+type mknodIn struct {
+	Mode    uint32
+	Rdev    uint32
+	Umask   uint32
+	padding uint32
+	// "filename\x00" follows.
+}
+
+func mknodInSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 12}):
+		return unsafe.Offsetof(mknodIn{}.Umask)
+	default:
+		return unsafe.Sizeof(mknodIn{})
+	}
+}
+
+type mkdirIn struct {
+	Mode  uint32
+	Umask uint32
+	// filename follows
+}
+
+func mkdirInSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 12}):
+		return unsafe.Offsetof(mkdirIn{}.Umask) + 4
+	default:
+		return unsafe.Sizeof(mkdirIn{})
+	}
+}
+
+type renameIn struct {
+	Newdir uint64
+	// "oldname\x00newname\x00" follows
+}
+
+// OS X
+type exchangeIn struct {
+	Olddir  uint64
+	Newdir  uint64
+	Options uint64
+}
+
+type linkIn struct {
+	Oldnodeid uint64
+}
+
+type setattrInCommon struct {
+	Valid     uint32
+	Padding   uint32
+	Fh        uint64
+	Size      uint64
+	LockOwner uint64 // unused on OS X?
+	Atime     uint64
+	Mtime     uint64
+	Unused2   uint64
+	AtimeNsec uint32
+	MtimeNsec uint32
+	Unused3   uint32
+	Mode      uint32
+	Unused4   uint32
+	Uid       uint32
+	Gid       uint32
+	Unused5   uint32
+}
+
+type openIn struct {
+	Flags  uint32
+	Unused uint32
+}
+
+type openOut struct {
+	Fh        uint64
+	OpenFlags uint32
+	Padding   uint32
+}
+
+type createIn struct {
+	Flags   uint32
+	Mode    uint32
+	Umask   uint32
+	padding uint32
+}
+
+func createInSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 12}):
+		return unsafe.Offsetof(createIn{}.Umask)
+	default:
+		return unsafe.Sizeof(createIn{})
+	}
+}
+
+type releaseIn struct {
+	Fh           uint64
+	Flags        uint32
+	ReleaseFlags uint32
+	LockOwner    uint32
+}
+
+type flushIn struct {
+	Fh         uint64
+	FlushFlags uint32
+	Padding    uint32
+	LockOwner  uint64
+}
+
+type readIn struct {
+	Fh        uint64
+	Offset    uint64
+	Size      uint32
+	ReadFlags uint32
+	LockOwner uint64
+	Flags     uint32
+	padding   uint32
+}
+
+func readInSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 9}):
+		return unsafe.Offsetof(readIn{}.ReadFlags) + 4
+	default:
+		return unsafe.Sizeof(readIn{})
+	}
+}
+
+// The ReadFlags are passed in ReadRequest.
+type ReadFlags uint32
+
+const (
+	// LockOwner field is valid.
+	ReadLockOwner ReadFlags = 1 << 1
+)
+
+var readFlagNames = []flagName{
+	{uint32(ReadLockOwner), "ReadLockOwner"},
+}
+
+func (fl ReadFlags) String() string {
+	return flagString(uint32(fl), readFlagNames)
+}
+
+type writeIn struct {
+	Fh         uint64
+	Offset     uint64
+	Size       uint32
+	WriteFlags uint32
+	LockOwner  uint64
+	Flags      uint32
+	padding    uint32
+}
+
+func writeInSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 9}):
+		return unsafe.Offsetof(writeIn{}.LockOwner)
+	default:
+		return unsafe.Sizeof(writeIn{})
+	}
+}
+
+type writeOut struct {
+	Size    uint32
+	Padding uint32
+}
+
+// The WriteFlags are passed in WriteRequest.
+type WriteFlags uint32
+
+const (
+	WriteCache WriteFlags = 1 << 0
+	// LockOwner field is valid.
+	WriteLockOwner WriteFlags = 1 << 1
+)
+
+var writeFlagNames = []flagName{
+	{uint32(WriteCache), "WriteCache"},
+	{uint32(WriteLockOwner), "WriteLockOwner"},
+}
+
+func (fl WriteFlags) String() string {
+	return flagString(uint32(fl), writeFlagNames)
+}
+
+const compatStatfsSize = 48
+
+type statfsOut struct {
+	St kstatfs
+}
+
+type fsyncIn struct {
+	Fh         uint64
+	FsyncFlags uint32
+	Padding    uint32
+}
+
+type setxattrInCommon struct {
+	Size  uint32
+	Flags uint32
+}
+
+func (setxattrInCommon) position() uint32 {
+	return 0
+}
+
+type getxattrInCommon struct {
+	Size    uint32
+	Padding uint32
+}
+
+func (getxattrInCommon) position() uint32 {
+	return 0
+}
+
+type getxattrOut struct {
+	Size    uint32
+	Padding uint32
+}
+
+type lkIn struct {
+	Fh      uint64
+	Owner   uint64
+	Lk      fileLock
+	LkFlags uint32
+	padding uint32
+}
+
+func lkInSize(p Protocol) uintptr {
+	switch {
+	case p.LT(Protocol{7, 9}):
+		return unsafe.Offsetof(lkIn{}.LkFlags)
+	default:
+		return unsafe.Sizeof(lkIn{})
+	}
+}
+
+type lkOut struct {
+	Lk fileLock
+}
+
+type accessIn struct {
+	Mask    uint32
+	Padding uint32
+}
+
+type initIn struct {
+	Major        uint32
+	Minor        uint32
+	MaxReadahead uint32
+	Flags        uint32
+}
+
+const initInSize = int(unsafe.Sizeof(initIn{}))
+
+type initOut struct {
+	Major        uint32
+	Minor        uint32
+	MaxReadahead uint32
+	Flags        uint32
+	Unused       uint32
+	MaxWrite     uint32
+}
+
+type interruptIn struct {
+	Unique uint64
+}
+
+type bmapIn struct {
+	Block     uint64
+	BlockSize uint32
+	Padding   uint32
+}
+
+type bmapOut struct {
+	Block uint64
+}
+
+type inHeader struct {
+	Len     uint32
+	Opcode  uint32
+	Unique  uint64
+	Nodeid  uint64
+	Uid     uint32
+	Gid     uint32
+	Pid     uint32
+	Padding uint32
+}
+
+const inHeaderSize = int(unsafe.Sizeof(inHeader{}))
+
+type outHeader struct {
+	Len    uint32
+	Error  int32
+	Unique uint64
+}
+
+type dirent struct {
+	Ino     uint64
+	Off     uint64
+	Namelen uint32
+	Type    uint32
+	Name    [0]byte
+}
+
+const direntSize = 8 + 8 + 4 + 4
+
+const (
+	notifyCodePoll       int32 = 1
+	notifyCodeInvalInode int32 = 2
+	notifyCodeInvalEntry int32 = 3
+)
+
+type notifyInvalInodeOut struct {
+	Ino uint64
+	Off int64
+	Len int64
+}
+
+type notifyInvalEntryOut struct {
+	Parent  uint64
+	Namelen uint32
+	padding uint32
+}

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_darwin.go

@@ -0,0 +1,88 @@
+package fuse
+
+import (
+	"time"
+)
+
+type attr struct {
+	Ino        uint64
+	Size       uint64
+	Blocks     uint64
+	Atime      uint64
+	Mtime      uint64
+	Ctime      uint64
+	Crtime_    uint64 // OS X only
+	AtimeNsec  uint32
+	MtimeNsec  uint32
+	CtimeNsec  uint32
+	CrtimeNsec uint32 // OS X only
+	Mode       uint32
+	Nlink      uint32
+	Uid        uint32
+	Gid        uint32
+	Rdev       uint32
+	Flags_     uint32 // OS X only; see chflags(2)
+	Blksize    uint32
+	padding    uint32
+}
+
+func (a *attr) SetCrtime(s uint64, ns uint32) {
+	a.Crtime_, a.CrtimeNsec = s, ns
+}
+
+func (a *attr) SetFlags(f uint32) {
+	a.Flags_ = f
+}
+
+type setattrIn struct {
+	setattrInCommon
+
+	// OS X only
+	Bkuptime_    uint64
+	Chgtime_     uint64
+	Crtime       uint64
+	BkuptimeNsec uint32
+	ChgtimeNsec  uint32
+	CrtimeNsec   uint32
+	Flags_       uint32 // see chflags(2)
+}
+
+func (in *setattrIn) BkupTime() time.Time {
+	return time.Unix(int64(in.Bkuptime_), int64(in.BkuptimeNsec))
+}
+
+func (in *setattrIn) Chgtime() time.Time {
+	return time.Unix(int64(in.Chgtime_), int64(in.ChgtimeNsec))
+}
+
+func (in *setattrIn) Flags() uint32 {
+	return in.Flags_
+}
+
+func openFlags(flags uint32) OpenFlags {
+	return OpenFlags(flags)
+}
+
+type getxattrIn struct {
+	getxattrInCommon
+
+	// OS X only
+	Position uint32
+	Padding  uint32
+}
+
+func (g *getxattrIn) position() uint32 {
+	return g.Position
+}
+
+type setxattrIn struct {
+	setxattrInCommon
+
+	// OS X only
+	Position uint32
+	Padding  uint32
+}
+
+func (s *setxattrIn) position() uint32 {
+	return s.Position
+}

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_freebsd.go

@@ -0,0 +1,62 @@
+package fuse
+
+import "time"
+
+type attr struct {
+	Ino       uint64
+	Size      uint64
+	Blocks    uint64
+	Atime     uint64
+	Mtime     uint64
+	Ctime     uint64
+	AtimeNsec uint32
+	MtimeNsec uint32
+	CtimeNsec uint32
+	Mode      uint32
+	Nlink     uint32
+	Uid       uint32
+	Gid       uint32
+	Rdev      uint32
+	Blksize   uint32
+	padding   uint32
+}
+
+func (a *attr) Crtime() time.Time {
+	return time.Time{}
+}
+
+func (a *attr) SetCrtime(s uint64, ns uint32) {
+	// ignored on freebsd
+}
+
+func (a *attr) SetFlags(f uint32) {
+	// ignored on freebsd
+}
+
+type setattrIn struct {
+	setattrInCommon
+}
+
+func (in *setattrIn) BkupTime() time.Time {
+	return time.Time{}
+}
+
+func (in *setattrIn) Chgtime() time.Time {
+	return time.Time{}
+}
+
+func (in *setattrIn) Flags() uint32 {
+	return 0
+}
+
+func openFlags(flags uint32) OpenFlags {
+	return OpenFlags(flags)
+}
+
+type getxattrIn struct {
+	getxattrInCommon
+}
+
+type setxattrIn struct {
+	setxattrInCommon
+}

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_linux.go

@@ -0,0 +1,70 @@
+package fuse
+
+import "time"
+
+type attr struct {
+	Ino       uint64
+	Size      uint64
+	Blocks    uint64
+	Atime     uint64
+	Mtime     uint64
+	Ctime     uint64
+	AtimeNsec uint32
+	MtimeNsec uint32
+	CtimeNsec uint32
+	Mode      uint32
+	Nlink     uint32
+	Uid       uint32
+	Gid       uint32
+	Rdev      uint32
+	Blksize   uint32
+	padding   uint32
+}
+
+func (a *attr) Crtime() time.Time {
+	return time.Time{}
+}
+
+func (a *attr) SetCrtime(s uint64, ns uint32) {
+	// Ignored on Linux.
+}
+
+func (a *attr) SetFlags(f uint32) {
+	// Ignored on Linux.
+}
+
+type setattrIn struct {
+	setattrInCommon
+}
+
+func (in *setattrIn) BkupTime() time.Time {
+	return time.Time{}
+}
+
+func (in *setattrIn) Chgtime() time.Time {
+	return time.Time{}
+}
+
+func (in *setattrIn) Flags() uint32 {
+	return 0
+}
+
+func openFlags(flags uint32) OpenFlags {
+	// on amd64, the 32-bit O_LARGEFILE flag is always seen;
+	// on i386, the flag probably depends on the app
+	// requesting, but in any case should be utterly
+	// uninteresting to us here; our kernel protocol messages
+	// are not directly related to the client app's kernel
+	// API/ABI
+	flags &^= 0x8000
+
+	return OpenFlags(flags)
+}
+
+type getxattrIn struct {
+	getxattrInCommon
+}
+
+type setxattrIn struct {
+	setxattrInCommon
+}

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_std.go

@@ -0,0 +1 @@
+package fuse

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_test.go

@@ -0,0 +1,31 @@
+package fuse_test
+
+import (
+	"os"
+	"testing"
+
+	"bazil.org/fuse"
+)
+
+func TestOpenFlagsAccmodeMask(t *testing.T) {
+	var f = fuse.OpenFlags(os.O_RDWR | os.O_SYNC)
+	if g, e := f&fuse.OpenAccessModeMask, fuse.OpenReadWrite; g != e {
+		t.Fatalf("OpenAccessModeMask behaves wrong: %v: %o != %o", f, g, e)
+	}
+	if f.IsReadOnly() {
+		t.Fatalf("IsReadOnly is wrong: %v", f)
+	}
+	if f.IsWriteOnly() {
+		t.Fatalf("IsWriteOnly is wrong: %v", f)
+	}
+	if !f.IsReadWrite() {
+		t.Fatalf("IsReadWrite is wrong: %v", f)
+	}
+}
+
+func TestOpenFlagsString(t *testing.T) {
+	var f = fuse.OpenFlags(os.O_RDWR | os.O_SYNC | os.O_APPEND)
+	if g, e := f.String(), "OpenReadWrite+OpenAppend+OpenSync"; g != e {
+		t.Fatalf("OpenFlags.String: %q != %q", g, e)
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/fuseutil/fuseutil.go

@@ -0,0 +1,20 @@
+package fuseutil
+
+import (
+	"bazil.org/fuse"
+)
+
+// HandleRead handles a read request assuming that data is the entire file content.
+// It adjusts the amount returned in resp according to req.Offset and req.Size.
+func HandleRead(req *fuse.ReadRequest, resp *fuse.ReadResponse, data []byte) {
+	if req.Offset >= int64(len(data)) {
+		data = nil
+	} else {
+		data = data[req.Offset:]
+	}
+	if len(data) > req.Size {
+		data = data[:req.Size]
+	}
+	n := copy(resp.Data[:req.Size], data)
+	resp.Data = resp.Data[:n]
+}

Godeps/_workspace/src/bazil.org/fuse/mount_darwin.go

@@ -0,0 +1,126 @@
+package fuse
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+var errNoAvail = errors.New("no available fuse devices")
+
+var errNotLoaded = errors.New("osxfusefs is not loaded")
+
+func loadOSXFUSE() error {
+	cmd := exec.Command("/Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs")
+	cmd.Dir = "/"
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	return err
+}
+
+func openOSXFUSEDev() (*os.File, error) {
+	var f *os.File
+	var err error
+	for i := uint64(0); ; i++ {
+		path := "/dev/osxfuse" + strconv.FormatUint(i, 10)
+		f, err = os.OpenFile(path, os.O_RDWR, 0000)
+		if os.IsNotExist(err) {
+			if i == 0 {
+				// not even the first device was found -> fuse is not loaded
+				return nil, errNotLoaded
+			}
+
+			// we've run out of kernel-provided devices
+			return nil, errNoAvail
+		}
+
+		if err2, ok := err.(*os.PathError); ok && err2.Err == syscall.EBUSY {
+			// try the next one
+			continue
+		}
+
+		if err != nil {
+			return nil, err
+		}
+		return f, nil
+	}
+}
+
+func callMount(dir string, conf *mountConfig, f *os.File, ready chan<- struct{}, errp *error) error {
+	bin := "/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs"
+
+	for k, v := range conf.options {
+		if strings.Contains(k, ",") || strings.Contains(v, ",") {
+			// Silly limitation but the mount helper does not
+			// understand any escaping. See TestMountOptionCommaError.
+			return fmt.Errorf("mount options cannot contain commas on darwin: %q=%q", k, v)
+		}
+	}
+	cmd := exec.Command(
+		bin,
+		"-o", conf.getOptions(),
+		// Tell osxfuse-kext how large our buffer is. It must split
+		// writes larger than this into multiple writes.
+		//
+		// OSXFUSE seems to ignore InitResponse.MaxWrite, and uses
+		// this instead.
+		"-o", "iosize="+strconv.FormatUint(maxWrite, 10),
+		// refers to fd passed in cmd.ExtraFiles
+		"3",
+		dir,
+	)
+	cmd.ExtraFiles = []*os.File{f}
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, "MOUNT_FUSEFS_CALL_BY_LIB=")
+	// TODO this is used for fs typenames etc, let app influence it
+	cmd.Env = append(cmd.Env, "MOUNT_FUSEFS_DAEMON_PATH="+bin)
+	var buf bytes.Buffer
+	cmd.Stdout = &buf
+	cmd.Stderr = &buf
+
+	err := cmd.Start()
+	if err != nil {
+		return err
+	}
+	go func() {
+		err := cmd.Wait()
+		if err != nil {
+			if buf.Len() > 0 {
+				output := buf.Bytes()
+				output = bytes.TrimRight(output, "\n")
+				msg := err.Error() + ": " + string(output)
+				err = errors.New(msg)
+			}
+		}
+		*errp = err
+		close(ready)
+	}()
+	return err
+}
+
+func mount(dir string, conf *mountConfig, ready chan<- struct{}, errp *error) (*os.File, error) {
+	f, err := openOSXFUSEDev()
+	if err == errNotLoaded {
+		err = loadOSXFUSE()
+		if err != nil {
+			return nil, err
+		}
+		// try again
+		f, err = openOSXFUSEDev()
+	}
+	if err != nil {
+		return nil, err
+	}
+	err = callMount(dir, conf, f, ready, errp)
+	if err != nil {
+		f.Close()
+		return nil, err
+	}
+	return f, nil
+}

Godeps/_workspace/src/bazil.org/fuse/mount_freebsd.go

@@ -0,0 +1,41 @@
+package fuse
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func mount(dir string, conf *mountConfig, ready chan<- struct{}, errp *error) (*os.File, error) {
+	for k, v := range conf.options {
+		if strings.Contains(k, ",") || strings.Contains(v, ",") {
+			// Silly limitation but the mount helper does not
+			// understand any escaping. See TestMountOptionCommaError.
+			return nil, fmt.Errorf("mount options cannot contain commas on FreeBSD: %q=%q", k, v)
+		}
+	}
+
+	f, err := os.OpenFile("/dev/fuse", os.O_RDWR, 0000)
+	if err != nil {
+		*errp = err
+		return nil, err
+	}
+
+	cmd := exec.Command(
+		"/sbin/mount_fusefs",
+		"--safe",
+		"-o", conf.getOptions(),
+		"3",
+		dir,
+	)
+	cmd.ExtraFiles = []*os.File{f}
+
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("mount_fusefs: %q, %v", out, err)
+	}
+
+	close(ready)
+	return f, nil
+}

Godeps/_workspace/src/bazil.org/fuse/mount_linux.go

@@ -0,0 +1,112 @@
+package fuse
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"os"
+	"os/exec"
+	"sync"
+	"syscall"
+)
+
+func lineLogger(wg *sync.WaitGroup, prefix string, r io.ReadCloser) {
+	defer wg.Done()
+
+	scanner := bufio.NewScanner(r)
+	for scanner.Scan() {
+		switch line := scanner.Text(); line {
+		case `fusermount: failed to open /etc/fuse.conf: Permission denied`:
+			// Silence this particular message, it occurs way too
+			// commonly and isn't very relevant to whether the mount
+			// succeeds or not.
+			continue
+		default:
+			log.Printf("%s: %s", prefix, line)
+		}
+	}
+	if err := scanner.Err(); err != nil {
+		log.Printf("%s, error reading: %v", prefix, err)
+	}
+}
+
+func mount(dir string, conf *mountConfig, ready chan<- struct{}, errp *error) (fusefd *os.File, err error) {
+	// linux mount is never delayed
+	close(ready)
+
+	fds, err := syscall.Socketpair(syscall.AF_FILE, syscall.SOCK_STREAM, 0)
+	if err != nil {
+		return nil, fmt.Errorf("socketpair error: %v", err)
+	}
+
+	writeFile := os.NewFile(uintptr(fds[0]), "fusermount-child-writes")
+	defer writeFile.Close()
+
+	readFile := os.NewFile(uintptr(fds[1]), "fusermount-parent-reads")
+	defer readFile.Close()
+
+	cmd := exec.Command(
+		"fusermount",
+		"-o", conf.getOptions(),
+		"--",
+		dir,
+	)
+	cmd.Env = append(os.Environ(), "_FUSE_COMMFD=3")
+
+	cmd.ExtraFiles = []*os.File{writeFile}
+
+	var wg sync.WaitGroup
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("setting up fusermount stderr: %v", err)
+	}
+	stderr, err := cmd.StderrPipe()
+	if err != nil {
+		return nil, fmt.Errorf("setting up fusermount stderr: %v", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("fusermount: %v", err)
+	}
+	wg.Add(2)
+	go lineLogger(&wg, "mount helper output", stdout)
+	go lineLogger(&wg, "mount helper error", stderr)
+	wg.Wait()
+	if err := cmd.Wait(); err != nil {
+		return nil, fmt.Errorf("fusermount: %v", err)
+	}
+
+	c, err := net.FileConn(readFile)
+	if err != nil {
+		return nil, fmt.Errorf("FileConn from fusermount socket: %v", err)
+	}
+	defer c.Close()
+
+	uc, ok := c.(*net.UnixConn)
+	if !ok {
+		return nil, fmt.Errorf("unexpected FileConn type; expected UnixConn, got %T", c)
+	}
+
+	buf := make([]byte, 32) // expect 1 byte
+	oob := make([]byte, 32) // expect 24 bytes
+	_, oobn, _, _, err := uc.ReadMsgUnix(buf, oob)
+	scms, err := syscall.ParseSocketControlMessage(oob[:oobn])
+	if err != nil {
+		return nil, fmt.Errorf("ParseSocketControlMessage: %v", err)
+	}
+	if len(scms) != 1 {
+		return nil, fmt.Errorf("expected 1 SocketControlMessage; got scms = %#v", scms)
+	}
+	scm := scms[0]
+	gotFds, err := syscall.ParseUnixRights(&scm)
+	if err != nil {
+		return nil, fmt.Errorf("syscall.ParseUnixRights: %v", err)
+	}
+	if len(gotFds) != 1 {
+		return nil, fmt.Errorf("wanted 1 fd; got %#v", gotFds)
+	}
+	f := os.NewFile(uintptr(gotFds[0]), "/dev/fuse")
+	return f, nil
+}

Godeps/_workspace/src/bazil.org/fuse/options.go

@@ -0,0 +1,170 @@
+package fuse
+
+import (
+	"errors"
+	"strings"
+)
+
+func dummyOption(conf *mountConfig) error {
+	return nil
+}
+
+// mountConfig holds the configuration for a mount operation.
+// Use it by passing MountOption values to Mount.
+type mountConfig struct {
+	options      map[string]string
+	maxReadahead uint32
+	initFlags    InitFlags
+}
+
+func escapeComma(s string) string {
+	s = strings.Replace(s, `\`, `\\`, -1)
+	s = strings.Replace(s, `,`, `\,`, -1)
+	return s
+}
+
+// getOptions makes a string of options suitable for passing to FUSE
+// mount flag `-o`. Returns an empty string if no options were set.
+// Any platform specific adjustments should happen before the call.
+func (m *mountConfig) getOptions() string {
+	var opts []string
+	for k, v := range m.options {
+		k = escapeComma(k)
+		if v != "" {
+			k += "=" + escapeComma(v)
+		}
+		opts = append(opts, k)
+	}
+	return strings.Join(opts, ",")
+}
+
+type mountOption func(*mountConfig) error
+
+// MountOption is passed to Mount to change the behavior of the mount.
+type MountOption mountOption
+
+// FSName sets the file system name (also called source) that is
+// visible in the list of mounted file systems.
+//
+// FreeBSD ignores this option.
+func FSName(name string) MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["fsname"] = name
+		return nil
+	}
+}
+
+// Subtype sets the subtype of the mount. The main type is always
+// `fuse`. The type in a list of mounted file systems will look like
+// `fuse.foo`.
+//
+// OS X ignores this option.
+// FreeBSD ignores this option.
+func Subtype(fstype string) MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["subtype"] = fstype
+		return nil
+	}
+}
+
+// LocalVolume sets the volume to be local (instead of network),
+// changing the behavior of Finder, Spotlight, and such.
+//
+// OS X only. Others ignore this option.
+func LocalVolume() MountOption {
+	return localVolume
+}
+
+// VolumeName sets the volume name shown in Finder.
+//
+// OS X only. Others ignore this option.
+func VolumeName(name string) MountOption {
+	return volumeName(name)
+}
+
+var ErrCannotCombineAllowOtherAndAllowRoot = errors.New("cannot combine AllowOther and AllowRoot")
+
+// AllowOther allows other users to access the file system.
+//
+// Only one of AllowOther or AllowRoot can be used.
+func AllowOther() MountOption {
+	return func(conf *mountConfig) error {
+		if _, ok := conf.options["allow_root"]; ok {
+			return ErrCannotCombineAllowOtherAndAllowRoot
+		}
+		conf.options["allow_other"] = ""
+		return nil
+	}
+}
+
+// AllowRoot allows other users to access the file system.
+//
+// Only one of AllowOther or AllowRoot can be used.
+//
+// FreeBSD ignores this option.
+func AllowRoot() MountOption {
+	return func(conf *mountConfig) error {
+		if _, ok := conf.options["allow_other"]; ok {
+			return ErrCannotCombineAllowOtherAndAllowRoot
+		}
+		conf.options["allow_root"] = ""
+		return nil
+	}
+}
+
+// DefaultPermissions makes the kernel enforce access control based on
+// the file mode (as in chmod).
+//
+// Without this option, the Node itself decides what is and is not
+// allowed. This is normally ok because FUSE file systems cannot be
+// accessed by other users without AllowOther/AllowRoot.
+//
+// FreeBSD ignores this option.
+func DefaultPermissions() MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["default_permissions"] = ""
+		return nil
+	}
+}
+
+// ReadOnly makes the mount read-only.
+func ReadOnly() MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["ro"] = ""
+		return nil
+	}
+}
+
+// MaxReadahead sets the number of bytes that can be prefetched for
+// sequential reads. The kernel can enforce a maximum value lower than
+// this.
+//
+// This setting makes the kernel perform speculative reads that do not
+// originate from any client process. This usually tremendously
+// improves read performance.
+func MaxReadahead(n uint32) MountOption {
+	return func(conf *mountConfig) error {
+		conf.maxReadahead = n
+		return nil
+	}
+}
+
+// AsyncRead enables multiple outstanding read requests for the same
+// handle. Without this, there is at most one request in flight at a
+// time.
+func AsyncRead() MountOption {
+	return func(conf *mountConfig) error {
+		conf.initFlags |= InitAsyncRead
+		return nil
+	}
+}
+
+// WritebackCache enables the kernel to buffer writes before sending
+// them to the FUSE server. Without this, writethrough caching is
+// used.
+func WritebackCache() MountOption {
+	return func(conf *mountConfig) error {
+		conf.initFlags |= InitWritebackCache
+		return nil
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/options_darwin.go

@@ -0,0 +1,13 @@
+package fuse
+
+func localVolume(conf *mountConfig) error {
+	conf.options["local"] = ""
+	return nil
+}
+
+func volumeName(name string) MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["volname"] = name
+		return nil
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/options_freebsd.go

@@ -0,0 +1,9 @@
+package fuse
+
+func localVolume(conf *mountConfig) error {
+	return nil
+}
+
+func volumeName(name string) MountOption {
+	return dummyOption
+}

Godeps/_workspace/src/bazil.org/fuse/options_helper_test.go

@@ -0,0 +1,10 @@
+package fuse
+
+// for TestMountOptionCommaError
+func ForTestSetMountOption(k, v string) MountOption {
+	fn := func(conf *mountConfig) error {
+		conf.options[k] = v
+		return nil
+	}
+	return fn
+}

Godeps/_workspace/src/bazil.org/fuse/options_linux.go

@@ -0,0 +1,9 @@
+package fuse
+
+func localVolume(conf *mountConfig) error {
+	return nil
+}
+
+func volumeName(name string) MountOption {
+	return dummyOption
+}

Godeps/_workspace/src/bazil.org/fuse/options_nocomma_test.go

@@ -0,0 +1,31 @@
+// This file contains tests for platforms that have no escape
+// mechanism for including commas in mount options.
+//
+// +build darwin
+
+package fuse_test
+
+import (
+	"runtime"
+	"testing"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs/fstestutil"
+)
+
+func TestMountOptionCommaError(t *testing.T) {
+	t.Parallel()
+	// this test is not tied to any specific option, it just needs
+	// some string content
+	var evil = "FuseTest,Marker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.ForTestSetMountOption("fusetest", evil),
+	)
+	if err == nil {
+		mnt.Close()
+		t.Fatal("expected an error about commas")
+	}
+	if g, e := err.Error(), `mount options cannot contain commas on `+runtime.GOOS+`: "fusetest"="FuseTest,Marker"`; g != e {
+		t.Fatalf("wrong error: %q != %q", g, e)
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/options_test.go

@@ -0,0 +1,231 @@
+package fuse_test
+
+import (
+	"os"
+	"runtime"
+	"syscall"
+	"testing"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"bazil.org/fuse/fs/fstestutil"
+	"golang.org/x/net/context"
+)
+
+func init() {
+	fstestutil.DebugByDefault()
+}
+
+func TestMountOptionFSName(t *testing.T) {
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support FSName")
+	}
+	t.Parallel()
+	const name = "FuseTestMarker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.FSName(name),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	info, err := fstestutil.GetMountInfo(mnt.Dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g, e := info.FSName, name; g != e {
+		t.Errorf("wrong FSName: %q != %q", g, e)
+	}
+}
+
+func testMountOptionFSNameEvil(t *testing.T, evil string) {
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support FSName")
+	}
+	t.Parallel()
+	var name = "FuseTest" + evil + "Marker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.FSName(name),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	info, err := fstestutil.GetMountInfo(mnt.Dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g, e := info.FSName, name; g != e {
+		t.Errorf("wrong FSName: %q != %q", g, e)
+	}
+}
+
+func TestMountOptionFSNameEvilComma(t *testing.T) {
+	if runtime.GOOS == "darwin" {
+		// see TestMountOptionCommaError for a test that enforces we
+		// at least give a nice error, instead of corrupting the mount
+		// options
+		t.Skip("TODO: OS X gets this wrong, commas in mount options cannot be escaped at all")
+	}
+	testMountOptionFSNameEvil(t, ",")
+}
+
+func TestMountOptionFSNameEvilSpace(t *testing.T) {
+	testMountOptionFSNameEvil(t, " ")
+}
+
+func TestMountOptionFSNameEvilTab(t *testing.T) {
+	testMountOptionFSNameEvil(t, "\t")
+}
+
+func TestMountOptionFSNameEvilNewline(t *testing.T) {
+	testMountOptionFSNameEvil(t, "\n")
+}
+
+func TestMountOptionFSNameEvilBackslash(t *testing.T) {
+	testMountOptionFSNameEvil(t, `\`)
+}
+
+func TestMountOptionFSNameEvilBackslashDouble(t *testing.T) {
+	// catch double-unescaping, if it were to happen
+	testMountOptionFSNameEvil(t, `\\`)
+}
+
+func TestMountOptionSubtype(t *testing.T) {
+	if runtime.GOOS == "darwin" {
+		t.Skip("OS X does not support Subtype")
+	}
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support Subtype")
+	}
+	t.Parallel()
+	const name = "FuseTestMarker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.Subtype(name),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	info, err := fstestutil.GetMountInfo(mnt.Dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g, e := info.Type, "fuse."+name; g != e {
+		t.Errorf("wrong Subtype: %q != %q", g, e)
+	}
+}
+
+// TODO test LocalVolume
+
+// TODO test AllowOther; hard because needs system-level authorization
+
+func TestMountOptionAllowOtherThenAllowRoot(t *testing.T) {
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.AllowOther(),
+		fuse.AllowRoot(),
+	)
+	if err == nil {
+		mnt.Close()
+	}
+	if g, e := err, fuse.ErrCannotCombineAllowOtherAndAllowRoot; g != e {
+		t.Fatalf("wrong error: %v != %v", g, e)
+	}
+}
+
+// TODO test AllowRoot; hard because needs system-level authorization
+
+func TestMountOptionAllowRootThenAllowOther(t *testing.T) {
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.AllowRoot(),
+		fuse.AllowOther(),
+	)
+	if err == nil {
+		mnt.Close()
+	}
+	if g, e := err, fuse.ErrCannotCombineAllowOtherAndAllowRoot; g != e {
+		t.Fatalf("wrong error: %v != %v", g, e)
+	}
+}
+
+type unwritableFile struct{}
+
+func (f unwritableFile) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = 0000
+	return nil
+}
+
+func TestMountOptionDefaultPermissions(t *testing.T) {
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support DefaultPermissions")
+	}
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t,
+		fstestutil.SimpleFS{
+			&fstestutil.ChildMap{"child": unwritableFile{}},
+		},
+		nil,
+		fuse.DefaultPermissions(),
+	)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	// This will be prevented by kernel-level access checking when
+	// DefaultPermissions is used.
+	f, err := os.OpenFile(mnt.Dir+"/child", os.O_WRONLY, 0000)
+	if err == nil {
+		f.Close()
+		t.Fatal("expected an error")
+	}
+	if !os.IsPermission(err) {
+		t.Fatalf("expected a permission error, got %T: %v", err, err)
+	}
+}
+
+type createrDir struct {
+	fstestutil.Dir
+}
+
+var _ fs.NodeCreater = createrDir{}
+
+func (createrDir) Create(ctx context.Context, req *fuse.CreateRequest, resp *fuse.CreateResponse) (fs.Node, fs.Handle, error) {
+	// pick a really distinct error, to identify it later
+	return nil, nil, fuse.Errno(syscall.ENAMETOOLONG)
+}
+
+func TestMountOptionReadOnly(t *testing.T) {
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t,
+		fstestutil.SimpleFS{createrDir{}},
+		nil,
+		fuse.ReadOnly(),
+	)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	// This will be prevented by kernel-level access checking when
+	// ReadOnly is used.
+	f, err := os.Create(mnt.Dir + "/child")
+	if err == nil {
+		f.Close()
+		t.Fatal("expected an error")
+	}
+	perr, ok := err.(*os.PathError)
+	if !ok {
+		t.Fatalf("expected PathError, got %T: %v", err, err)
+	}
+	if perr.Err != syscall.EROFS {
+		t.Fatalf("expected EROFS, got %T: %v", err, err)
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/protocol.go

@@ -0,0 +1,75 @@
+package fuse
+
+import (
+	"fmt"
+)
+
+// Protocol is a FUSE protocol version number.
+type Protocol struct {
+	Major uint32
+	Minor uint32
+}
+
+func (p Protocol) String() string {
+	return fmt.Sprintf("%d.%d", p.Major, p.Minor)
+}
+
+// LT returns whether a is less than b.
+func (a Protocol) LT(b Protocol) bool {
+	return a.Major < b.Major ||
+		(a.Major == b.Major && a.Minor < b.Minor)
+}
+
+// GE returns whether a is greater than or equal to b.
+func (a Protocol) GE(b Protocol) bool {
+	return a.Major > b.Major ||
+		(a.Major == b.Major && a.Minor >= b.Minor)
+}
+
+func (a Protocol) is79() bool {
+	return a.GE(Protocol{7, 9})
+}
+
+// HasAttrBlockSize returns whether Attr.BlockSize is respected by the
+// kernel.
+func (a Protocol) HasAttrBlockSize() bool {
+	return a.is79()
+}
+
+// HasReadWriteFlags returns whether ReadRequest/WriteRequest
+// fields Flags and FileFlags are valid.
+func (a Protocol) HasReadWriteFlags() bool {
+	return a.is79()
+}
+
+// HasGetattrFlags returns whether GetattrRequest field Flags is
+// valid.
+func (a Protocol) HasGetattrFlags() bool {
+	return a.is79()
+}
+
+func (a Protocol) is710() bool {
+	return a.GE(Protocol{7, 10})
+}
+
+// HasOpenNonSeekable returns whether OpenResponse field Flags flag
+// OpenNonSeekable is supported.
+func (a Protocol) HasOpenNonSeekable() bool {
+	return a.is710()
+}
+
+func (a Protocol) is712() bool {
+	return a.GE(Protocol{7, 12})
+}
+
+// HasUmask returns whether CreateRequest/MkdirRequest/MknodRequest
+// field Umask is valid.
+func (a Protocol) HasUmask() bool {
+	return a.is712()
+}
+
+// HasInvalidate returns whether InvalidateNode/InvalidateEntry are
+// supported.
+func (a Protocol) HasInvalidate() bool {
+	return a.is712()
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/doc.go

@@ -0,0 +1,13 @@
+// Package syscallx provides wrappers that make syscalls on various
+// platforms more interoperable.
+//
+// The API intentionally omits the OS X-specific position and option
+// arguments for extended attribute calls.
+//
+// Not having position means it might not be useful for accessing the
+// resource fork. If that's needed by code inside fuse, a function
+// with a different name may be added on the side.
+//
+// Options can be implemented with separate wrappers, in the style of
+// Linux getxattr/lgetxattr/fgetxattr.
+package syscallx

Godeps/_workspace/src/bazil.org/fuse/syscallx/generate

@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+mksys="$(go env GOROOT)/src/pkg/syscall/mksyscall.pl"
+
+fix() {
+    sed 's,^package syscall$,&x\nimport "syscall",' \
+	| gofmt -r='BytePtrFromString -> syscall.BytePtrFromString' \
+	| gofmt -r='Syscall6 -> syscall.Syscall6' \
+	| gofmt -r='Syscall -> syscall.Syscall' \
+	| gofmt -r='SYS_GETXATTR -> syscall.SYS_GETXATTR' \
+	| gofmt -r='SYS_LISTXATTR -> syscall.SYS_LISTXATTR' \
+	| gofmt -r='SYS_SETXATTR -> syscall.SYS_SETXATTR' \
+	| gofmt -r='SYS_REMOVEXATTR -> syscall.SYS_REMOVEXATTR' \
+	| gofmt -r='SYS_MSYNC -> syscall.SYS_MSYNC'
+}
+
+cd "$(dirname "$0")"
+
+$mksys xattr_darwin.go \
+    | fix \
+    >xattr_darwin_amd64.go
+
+$mksys -l32 xattr_darwin.go \
+    | fix \
+    >xattr_darwin_386.go
+
+$mksys msync.go \
+    | fix \
+    >msync_amd64.go
+
+$mksys -l32 msync.go \
+    | fix \
+    >msync_386.go

Godeps/_workspace/src/bazil.org/fuse/syscallx/msync.go

@@ -0,0 +1,9 @@
+package syscallx
+
+/* This is the source file for msync_*.go, to regenerate run
+
+   ./generate
+
+*/
+
+//sys Msync(b []byte, flags int) (err error)

Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_386.go

@@ -0,0 +1,24 @@
+// mksyscall.pl -l32 msync.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_amd64.go

@@ -0,0 +1,24 @@
+// mksyscall.pl msync.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx.go

@@ -0,0 +1,4 @@
+package syscallx
+
+// make us look more like package syscall, so mksyscall.pl output works
+var _zero uintptr

Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx_std.go

@@ -0,0 +1,26 @@
+// +build !darwin
+
+package syscallx
+
+// This file just contains wrappers for platforms that already have
+// the right stuff in golang.org/x/sys/unix.
+
+import (
+	"golang.org/x/sys/unix"
+)
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	return unix.Getxattr(path, attr, dest)
+}
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	return unix.Listxattr(path, dest)
+}
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	return unix.Setxattr(path, attr, data, flags)
+}
+
+func Removexattr(path string, attr string) (err error) {
+	return unix.Removexattr(path, attr)
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin.go

@@ -0,0 +1,38 @@
+package syscallx
+
+/* This is the source file for syscallx_darwin_*.go, to regenerate run
+
+   ./generate
+
+*/
+
+// cannot use dest []byte here because OS X getxattr really wants a
+// NULL to trigger size probing, size==0 is not enough
+//
+//sys getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error)
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var destp *byte
+	if len(dest) > 0 {
+		destp = &dest[0]
+	}
+	return getxattr(path, attr, destp, len(dest), 0, 0)
+}
+
+//sys listxattr(path string, dest []byte, options int) (sz int, err error)
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	return listxattr(path, dest, 0)
+}
+
+//sys setxattr(path string, attr string, data []byte, position uint32, flags int) (err error)
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	return setxattr(path, attr, data, 0, flags)
+}
+
+//sys removexattr(path string, attr string, options int) (err error)
+
+func Removexattr(path string, attr string) (err error) {
+	return removexattr(path, attr, 0)
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_386.go

@@ -0,0 +1,97 @@
+// mksyscall.pl -l32 xattr_darwin.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest []byte, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data []byte, position uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(position), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_amd64.go

@@ -0,0 +1,97 @@
+// mksyscall.pl xattr_darwin.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest []byte, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data []byte, position uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(position), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/bazil.org/fuse/unmount.go

@@ -0,0 +1,6 @@
+package fuse
+
+// Unmount tries to unmount the filesystem mounted at dir.
+func Unmount(dir string) error {
+	return unmount(dir)
+}

Godeps/_workspace/src/bazil.org/fuse/unmount_linux.go

@@ -0,0 +1,21 @@
+package fuse
+
+import (
+	"bytes"
+	"errors"
+	"os/exec"
+)
+
+func unmount(dir string) error {
+	cmd := exec.Command("fusermount", "-u", dir)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		if len(output) > 0 {
+			output = bytes.TrimRight(output, "\n")
+			msg := err.Error() + ": " + string(output)
+			err = errors.New(msg)
+		}
+		return err
+	}
+	return nil
+}

Godeps/_workspace/src/bazil.org/fuse/unmount_std.go

@@ -0,0 +1,17 @@
+// +build !linux
+
+package fuse
+
+import (
+	"os"
+	"syscall"
+)
+
+func unmount(dir string) error {
+	err := syscall.Unmount(dir, 0)
+	if err != nil {
+		err = &os.PathError{Op: "unmount", Path: dir, Err: err}
+		return err
+	}
+	return nil
+}

Godeps/_workspace/src/golang.org/x/net/context/context.go

@@ -0,0 +1,447 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package context defines the Context type, which carries deadlines,
+// cancelation signals, and other request-scoped values across API boundaries
+// and between processes.
+//
+// Incoming requests to a server should create a Context, and outgoing calls to
+// servers should accept a Context.  The chain of function calls between must
+// propagate the Context, optionally replacing it with a modified copy created
+// using WithDeadline, WithTimeout, WithCancel, or WithValue.
+//
+// Programs that use Contexts should follow these rules to keep interfaces
+// consistent across packages and enable static analysis tools to check context
+// propagation:
+//
+// Do not store Contexts inside a struct type; instead, pass a Context
+// explicitly to each function that needs it.  The Context should be the first
+// parameter, typically named ctx:
+//
+// 	func DoSomething(ctx context.Context, arg Arg) error {
+// 		// ... use ctx ...
+// 	}
+//
+// Do not pass a nil Context, even if a function permits it.  Pass context.TODO
+// if you are unsure about which Context to use.
+//
+// Use context Values only for request-scoped data that transits processes and
+// APIs, not for passing optional parameters to functions.
+//
+// The same Context may be passed to functions running in different goroutines;
+// Contexts are safe for simultaneous use by multiple goroutines.
+//
+// See http://blog.golang.org/context for example code for a server that uses
+// Contexts.
+package context
+
+import (
+	"errors"
+	"fmt"
+	"sync"
+	"time"
+)
+
+// A Context carries a deadline, a cancelation signal, and other values across
+// API boundaries.
+//
+// Context's methods may be called by multiple goroutines simultaneously.
+type Context interface {
+	// Deadline returns the time when work done on behalf of this context
+	// should be canceled.  Deadline returns ok==false when no deadline is
+	// set.  Successive calls to Deadline return the same results.
+	Deadline() (deadline time.Time, ok bool)
+
+	// Done returns a channel that's closed when work done on behalf of this
+	// context should be canceled.  Done may return nil if this context can
+	// never be canceled.  Successive calls to Done return the same value.
+	//
+	// WithCancel arranges for Done to be closed when cancel is called;
+	// WithDeadline arranges for Done to be closed when the deadline
+	// expires; WithTimeout arranges for Done to be closed when the timeout
+	// elapses.
+	//
+	// Done is provided for use in select statements:
+	//
+	//  // Stream generates values with DoSomething and sends them to out
+	//  // until DoSomething returns an error or ctx.Done is closed.
+	//  func Stream(ctx context.Context, out <-chan Value) error {
+	//  	for {
+	//  		v, err := DoSomething(ctx)
+	//  		if err != nil {
+	//  			return err
+	//  		}
+	//  		select {
+	//  		case <-ctx.Done():
+	//  			return ctx.Err()
+	//  		case out <- v:
+	//  		}
+	//  	}
+	//  }
+	//
+	// See http://blog.golang.org/pipelines for more examples of how to use
+	// a Done channel for cancelation.
+	Done() <-chan struct{}
+
+	// Err returns a non-nil error value after Done is closed.  Err returns
+	// Canceled if the context was canceled or DeadlineExceeded if the
+	// context's deadline passed.  No other values for Err are defined.
+	// After Done is closed, successive calls to Err return the same value.
+	Err() error
+
+	// Value returns the value associated with this context for key, or nil
+	// if no value is associated with key.  Successive calls to Value with
+	// the same key returns the same result.
+	//
+	// Use context values only for request-scoped data that transits
+	// processes and API boundaries, not for passing optional parameters to
+	// functions.
+	//
+	// A key identifies a specific value in a Context.  Functions that wish
+	// to store values in Context typically allocate a key in a global
+	// variable then use that key as the argument to context.WithValue and
+	// Context.Value.  A key can be any type that supports equality;
+	// packages should define keys as an unexported type to avoid
+	// collisions.
+	//
+	// Packages that define a Context key should provide type-safe accessors
+	// for the values stores using that key:
+	//
+	// 	// Package user defines a User type that's stored in Contexts.
+	// 	package user
+	//
+	// 	import "golang.org/x/net/context"
+	//
+	// 	// User is the type of value stored in the Contexts.
+	// 	type User struct {...}
+	//
+	// 	// key is an unexported type for keys defined in this package.
+	// 	// This prevents collisions with keys defined in other packages.
+	// 	type key int
+	//
+	// 	// userKey is the key for user.User values in Contexts.  It is
+	// 	// unexported; clients use user.NewContext and user.FromContext
+	// 	// instead of using this key directly.
+	// 	var userKey key = 0
+	//
+	// 	// NewContext returns a new Context that carries value u.
+	// 	func NewContext(ctx context.Context, u *User) context.Context {
+	// 		return context.WithValue(ctx, userKey, u)
+	// 	}
+	//
+	// 	// FromContext returns the User value stored in ctx, if any.
+	// 	func FromContext(ctx context.Context) (*User, bool) {
+	// 		u, ok := ctx.Value(userKey).(*User)
+	// 		return u, ok
+	// 	}
+	Value(key interface{}) interface{}
+}
+
+// Canceled is the error returned by Context.Err when the context is canceled.
+var Canceled = errors.New("context canceled")
+
+// DeadlineExceeded is the error returned by Context.Err when the context's
+// deadline passes.
+var DeadlineExceeded = errors.New("context deadline exceeded")
+
+// An emptyCtx is never canceled, has no values, and has no deadline.  It is not
+// struct{}, since vars of this type must have distinct addresses.
+type emptyCtx int
+
+func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
+	return
+}
+
+func (*emptyCtx) Done() <-chan struct{} {
+	return nil
+}
+
+func (*emptyCtx) Err() error {
+	return nil
+}
+
+func (*emptyCtx) Value(key interface{}) interface{} {
+	return nil
+}
+
+func (e *emptyCtx) String() string {
+	switch e {
+	case background:
+		return "context.Background"
+	case todo:
+		return "context.TODO"
+	}
+	return "unknown empty Context"
+}
+
+var (
+	background = new(emptyCtx)
+	todo       = new(emptyCtx)
+)
+
+// Background returns a non-nil, empty Context. It is never canceled, has no
+// values, and has no deadline.  It is typically used by the main function,
+// initialization, and tests, and as the top-level Context for incoming
+// requests.
+func Background() Context {
+	return background
+}
+
+// TODO returns a non-nil, empty Context.  Code should use context.TODO when
+// it's unclear which Context to use or it's is not yet available (because the
+// surrounding function has not yet been extended to accept a Context
+// parameter).  TODO is recognized by static analysis tools that determine
+// whether Contexts are propagated correctly in a program.
+func TODO() Context {
+	return todo
+}
+
+// A CancelFunc tells an operation to abandon its work.
+// A CancelFunc does not wait for the work to stop.
+// After the first call, subsequent calls to a CancelFunc do nothing.
+type CancelFunc func()
+
+// WithCancel returns a copy of parent with a new Done channel. The returned
+// context's Done channel is closed when the returned cancel function is called
+// or when the parent context's Done channel is closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
+	c := newCancelCtx(parent)
+	propagateCancel(parent, &c)
+	return &c, func() { c.cancel(true, Canceled) }
+}
+
+// newCancelCtx returns an initialized cancelCtx.
+func newCancelCtx(parent Context) cancelCtx {
+	return cancelCtx{
+		Context: parent,
+		done:    make(chan struct{}),
+	}
+}
+
+// propagateCancel arranges for child to be canceled when parent is.
+func propagateCancel(parent Context, child canceler) {
+	if parent.Done() == nil {
+		return // parent is never canceled
+	}
+	if p, ok := parentCancelCtx(parent); ok {
+		p.mu.Lock()
+		if p.err != nil {
+			// parent has already been canceled
+			child.cancel(false, p.err)
+		} else {
+			if p.children == nil {
+				p.children = make(map[canceler]bool)
+			}
+			p.children[child] = true
+		}
+		p.mu.Unlock()
+	} else {
+		go func() {
+			select {
+			case <-parent.Done():
+				child.cancel(false, parent.Err())
+			case <-child.Done():
+			}
+		}()
+	}
+}
+
+// parentCancelCtx follows a chain of parent references until it finds a
+// *cancelCtx.  This function understands how each of the concrete types in this
+// package represents its parent.
+func parentCancelCtx(parent Context) (*cancelCtx, bool) {
+	for {
+		switch c := parent.(type) {
+		case *cancelCtx:
+			return c, true
+		case *timerCtx:
+			return &c.cancelCtx, true
+		case *valueCtx:
+			parent = c.Context
+		default:
+			return nil, false
+		}
+	}
+}
+
+// removeChild removes a context from its parent.
+func removeChild(parent Context, child canceler) {
+	p, ok := parentCancelCtx(parent)
+	if !ok {
+		return
+	}
+	p.mu.Lock()
+	if p.children != nil {
+		delete(p.children, child)
+	}
+	p.mu.Unlock()
+}
+
+// A canceler is a context type that can be canceled directly.  The
+// implementations are *cancelCtx and *timerCtx.
+type canceler interface {
+	cancel(removeFromParent bool, err error)
+	Done() <-chan struct{}
+}
+
+// A cancelCtx can be canceled.  When canceled, it also cancels any children
+// that implement canceler.
+type cancelCtx struct {
+	Context
+
+	done chan struct{} // closed by the first cancel call.
+
+	mu       sync.Mutex
+	children map[canceler]bool // set to nil by the first cancel call
+	err      error             // set to non-nil by the first cancel call
+}
+
+func (c *cancelCtx) Done() <-chan struct{} {
+	return c.done
+}
+
+func (c *cancelCtx) Err() error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	return c.err
+}
+
+func (c *cancelCtx) String() string {
+	return fmt.Sprintf("%v.WithCancel", c.Context)
+}
+
+// cancel closes c.done, cancels each of c's children, and, if
+// removeFromParent is true, removes c from its parent's children.
+func (c *cancelCtx) cancel(removeFromParent bool, err error) {
+	if err == nil {
+		panic("context: internal error: missing cancel error")
+	}
+	c.mu.Lock()
+	if c.err != nil {
+		c.mu.Unlock()
+		return // already canceled
+	}
+	c.err = err
+	close(c.done)
+	for child := range c.children {
+		// NOTE: acquiring the child's lock while holding parent's lock.
+		child.cancel(false, err)
+	}
+	c.children = nil
+	c.mu.Unlock()
+
+	if removeFromParent {
+		removeChild(c.Context, c)
+	}
+}
+
+// WithDeadline returns a copy of the parent context with the deadline adjusted
+// to be no later than d.  If the parent's deadline is already earlier than d,
+// WithDeadline(parent, d) is semantically equivalent to parent.  The returned
+// context's Done channel is closed when the deadline expires, when the returned
+// cancel function is called, or when the parent context's Done channel is
+// closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
+	if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
+		// The current deadline is already sooner than the new one.
+		return WithCancel(parent)
+	}
+	c := &timerCtx{
+		cancelCtx: newCancelCtx(parent),
+		deadline:  deadline,
+	}
+	propagateCancel(parent, c)
+	d := deadline.Sub(time.Now())
+	if d <= 0 {
+		c.cancel(true, DeadlineExceeded) // deadline has already passed
+		return c, func() { c.cancel(true, Canceled) }
+	}
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if c.err == nil {
+		c.timer = time.AfterFunc(d, func() {
+			c.cancel(true, DeadlineExceeded)
+		})
+	}
+	return c, func() { c.cancel(true, Canceled) }
+}
+
+// A timerCtx carries a timer and a deadline.  It embeds a cancelCtx to
+// implement Done and Err.  It implements cancel by stopping its timer then
+// delegating to cancelCtx.cancel.
+type timerCtx struct {
+	cancelCtx
+	timer *time.Timer // Under cancelCtx.mu.
+
+	deadline time.Time
+}
+
+func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
+	return c.deadline, true
+}
+
+func (c *timerCtx) String() string {
+	return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
+}
+
+func (c *timerCtx) cancel(removeFromParent bool, err error) {
+	c.cancelCtx.cancel(false, err)
+	if removeFromParent {
+		// Remove this timerCtx from its parent cancelCtx's children.
+		removeChild(c.cancelCtx.Context, c)
+	}
+	c.mu.Lock()
+	if c.timer != nil {
+		c.timer.Stop()
+		c.timer = nil
+	}
+	c.mu.Unlock()
+}
+
+// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete:
+//
+// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
+// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
+// 		return slowOperation(ctx)
+// 	}
+func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
+	return WithDeadline(parent, time.Now().Add(timeout))
+}
+
+// WithValue returns a copy of parent in which the value associated with key is
+// val.
+//
+// Use context Values only for request-scoped data that transits processes and
+// APIs, not for passing optional parameters to functions.
+func WithValue(parent Context, key interface{}, val interface{}) Context {
+	return &valueCtx{parent, key, val}
+}
+
+// A valueCtx carries a key-value pair.  It implements Value for that key and
+// delegates all other calls to the embedded Context.
+type valueCtx struct {
+	Context
+	key, val interface{}
+}
+
+func (c *valueCtx) String() string {
+	return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
+}
+
+func (c *valueCtx) Value(key interface{}) interface{} {
+	if c.key == key {
+		return c.val
+	}
+	return c.Context.Value(key)
+}

Godeps/_workspace/src/golang.org/x/net/context/context_test.go

@@ -0,0 +1,575 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package context
+
+import (
+	"fmt"
+	"math/rand"
+	"runtime"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+)
+
+// otherContext is a Context that's not one of the types defined in context.go.
+// This lets us test code paths that differ based on the underlying type of the
+// Context.
+type otherContext struct {
+	Context
+}
+
+func TestBackground(t *testing.T) {
+	c := Background()
+	if c == nil {
+		t.Fatalf("Background returned nil")
+	}
+	select {
+	case x := <-c.Done():
+		t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
+	default:
+	}
+	if got, want := fmt.Sprint(c), "context.Background"; got != want {
+		t.Errorf("Background().String() = %q want %q", got, want)
+	}
+}
+
+func TestTODO(t *testing.T) {
+	c := TODO()
+	if c == nil {
+		t.Fatalf("TODO returned nil")
+	}
+	select {
+	case x := <-c.Done():
+		t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
+	default:
+	}
+	if got, want := fmt.Sprint(c), "context.TODO"; got != want {
+		t.Errorf("TODO().String() = %q want %q", got, want)
+	}
+}
+
+func TestWithCancel(t *testing.T) {
+	c1, cancel := WithCancel(Background())
+
+	if got, want := fmt.Sprint(c1), "context.Background.WithCancel"; got != want {
+		t.Errorf("c1.String() = %q want %q", got, want)
+	}
+
+	o := otherContext{c1}
+	c2, _ := WithCancel(o)
+	contexts := []Context{c1, o, c2}
+
+	for i, c := range contexts {
+		if d := c.Done(); d == nil {
+			t.Errorf("c[%d].Done() == %v want non-nil", i, d)
+		}
+		if e := c.Err(); e != nil {
+			t.Errorf("c[%d].Err() == %v want nil", i, e)
+		}
+
+		select {
+		case x := <-c.Done():
+			t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
+		default:
+		}
+	}
+
+	cancel()
+	time.Sleep(100 * time.Millisecond) // let cancelation propagate
+
+	for i, c := range contexts {
+		select {
+		case <-c.Done():
+		default:
+			t.Errorf("<-c[%d].Done() blocked, but shouldn't have", i)
+		}
+		if e := c.Err(); e != Canceled {
+			t.Errorf("c[%d].Err() == %v want %v", i, e, Canceled)
+		}
+	}
+}
+
+func TestParentFinishesChild(t *testing.T) {
+	// Context tree:
+	// parent -> cancelChild
+	// parent -> valueChild -> timerChild
+	parent, cancel := WithCancel(Background())
+	cancelChild, stop := WithCancel(parent)
+	defer stop()
+	valueChild := WithValue(parent, "key", "value")
+	timerChild, stop := WithTimeout(valueChild, 10000*time.Hour)
+	defer stop()
+
+	select {
+	case x := <-parent.Done():
+		t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
+	case x := <-cancelChild.Done():
+		t.Errorf("<-cancelChild.Done() == %v want nothing (it should block)", x)
+	case x := <-timerChild.Done():
+		t.Errorf("<-timerChild.Done() == %v want nothing (it should block)", x)
+	case x := <-valueChild.Done():
+		t.Errorf("<-valueChild.Done() == %v want nothing (it should block)", x)
+	default:
+	}
+
+	// The parent's children should contain the two cancelable children.
+	pc := parent.(*cancelCtx)
+	cc := cancelChild.(*cancelCtx)
+	tc := timerChild.(*timerCtx)
+	pc.mu.Lock()
+	if len(pc.children) != 2 || !pc.children[cc] || !pc.children[tc] {
+		t.Errorf("bad linkage: pc.children = %v, want %v and %v",
+			pc.children, cc, tc)
+	}
+	pc.mu.Unlock()
+
+	if p, ok := parentCancelCtx(cc.Context); !ok || p != pc {
+		t.Errorf("bad linkage: parentCancelCtx(cancelChild.Context) = %v, %v want %v, true", p, ok, pc)
+	}
+	if p, ok := parentCancelCtx(tc.Context); !ok || p != pc {
+		t.Errorf("bad linkage: parentCancelCtx(timerChild.Context) = %v, %v want %v, true", p, ok, pc)
+	}
+
+	cancel()
+
+	pc.mu.Lock()
+	if len(pc.children) != 0 {
+		t.Errorf("pc.cancel didn't clear pc.children = %v", pc.children)
+	}
+	pc.mu.Unlock()
+
+	// parent and children should all be finished.
+	check := func(ctx Context, name string) {
+		select {
+		case <-ctx.Done():
+		default:
+			t.Errorf("<-%s.Done() blocked, but shouldn't have", name)
+		}
+		if e := ctx.Err(); e != Canceled {
+			t.Errorf("%s.Err() == %v want %v", name, e, Canceled)
+		}
+	}
+	check(parent, "parent")
+	check(cancelChild, "cancelChild")
+	check(valueChild, "valueChild")
+	check(timerChild, "timerChild")
+
+	// WithCancel should return a canceled context on a canceled parent.
+	precanceledChild := WithValue(parent, "key", "value")
+	select {
+	case <-precanceledChild.Done():
+	default:
+		t.Errorf("<-precanceledChild.Done() blocked, but shouldn't have")
+	}
+	if e := precanceledChild.Err(); e != Canceled {
+		t.Errorf("precanceledChild.Err() == %v want %v", e, Canceled)
+	}
+}
+
+func TestChildFinishesFirst(t *testing.T) {
+	cancelable, stop := WithCancel(Background())
+	defer stop()
+	for _, parent := range []Context{Background(), cancelable} {
+		child, cancel := WithCancel(parent)
+
+		select {
+		case x := <-parent.Done():
+			t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
+		case x := <-child.Done():
+			t.Errorf("<-child.Done() == %v want nothing (it should block)", x)
+		default:
+		}
+
+		cc := child.(*cancelCtx)
+		pc, pcok := parent.(*cancelCtx) // pcok == false when parent == Background()
+		if p, ok := parentCancelCtx(cc.Context); ok != pcok || (ok && pc != p) {
+			t.Errorf("bad linkage: parentCancelCtx(cc.Context) = %v, %v want %v, %v", p, ok, pc, pcok)
+		}
+
+		if pcok {
+			pc.mu.Lock()
+			if len(pc.children) != 1 || !pc.children[cc] {
+				t.Errorf("bad linkage: pc.children = %v, cc = %v", pc.children, cc)
+			}
+			pc.mu.Unlock()
+		}
+
+		cancel()
+
+		if pcok {
+			pc.mu.Lock()
+			if len(pc.children) != 0 {
+				t.Errorf("child's cancel didn't remove self from pc.children = %v", pc.children)
+			}
+			pc.mu.Unlock()
+		}
+
+		// child should be finished.
+		select {
+		case <-child.Done():
+		default:
+			t.Errorf("<-child.Done() blocked, but shouldn't have")
+		}
+		if e := child.Err(); e != Canceled {
+			t.Errorf("child.Err() == %v want %v", e, Canceled)
+		}
+
+		// parent should not be finished.
+		select {
+		case x := <-parent.Done():
+			t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
+		default:
+		}
+		if e := parent.Err(); e != nil {
+			t.Errorf("parent.Err() == %v want nil", e)
+		}
+	}
+}
+
+func testDeadline(c Context, wait time.Duration, t *testing.T) {
+	select {
+	case <-time.After(wait):
+		t.Fatalf("context should have timed out")
+	case <-c.Done():
+	}
+	if e := c.Err(); e != DeadlineExceeded {
+		t.Errorf("c.Err() == %v want %v", e, DeadlineExceeded)
+	}
+}
+
+func TestDeadline(t *testing.T) {
+	c, _ := WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
+	if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
+		t.Errorf("c.String() = %q want prefix %q", got, prefix)
+	}
+	testDeadline(c, 200*time.Millisecond, t)
+
+	c, _ = WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
+	o := otherContext{c}
+	testDeadline(o, 200*time.Millisecond, t)
+
+	c, _ = WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
+	o = otherContext{c}
+	c, _ = WithDeadline(o, time.Now().Add(300*time.Millisecond))
+	testDeadline(c, 200*time.Millisecond, t)
+}
+
+func TestTimeout(t *testing.T) {
+	c, _ := WithTimeout(Background(), 100*time.Millisecond)
+	if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
+		t.Errorf("c.String() = %q want prefix %q", got, prefix)
+	}
+	testDeadline(c, 200*time.Millisecond, t)
+
+	c, _ = WithTimeout(Background(), 100*time.Millisecond)
+	o := otherContext{c}
+	testDeadline(o, 200*time.Millisecond, t)
+
+	c, _ = WithTimeout(Background(), 100*time.Millisecond)
+	o = otherContext{c}
+	c, _ = WithTimeout(o, 300*time.Millisecond)
+	testDeadline(c, 200*time.Millisecond, t)
+}
+
+func TestCanceledTimeout(t *testing.T) {
+	c, _ := WithTimeout(Background(), 200*time.Millisecond)
+	o := otherContext{c}
+	c, cancel := WithTimeout(o, 400*time.Millisecond)
+	cancel()
+	time.Sleep(100 * time.Millisecond) // let cancelation propagate
+	select {
+	case <-c.Done():
+	default:
+		t.Errorf("<-c.Done() blocked, but shouldn't have")
+	}
+	if e := c.Err(); e != Canceled {
+		t.Errorf("c.Err() == %v want %v", e, Canceled)
+	}
+}
+
+type key1 int
+type key2 int
+
+var k1 = key1(1)
+var k2 = key2(1) // same int as k1, different type
+var k3 = key2(3) // same type as k2, different int
+
+func TestValues(t *testing.T) {
+	check := func(c Context, nm, v1, v2, v3 string) {
+		if v, ok := c.Value(k1).(string); ok == (len(v1) == 0) || v != v1 {
+			t.Errorf(`%s.Value(k1).(string) = %q, %t want %q, %t`, nm, v, ok, v1, len(v1) != 0)
+		}
+		if v, ok := c.Value(k2).(string); ok == (len(v2) == 0) || v != v2 {
+			t.Errorf(`%s.Value(k2).(string) = %q, %t want %q, %t`, nm, v, ok, v2, len(v2) != 0)
+		}
+		if v, ok := c.Value(k3).(string); ok == (len(v3) == 0) || v != v3 {
+			t.Errorf(`%s.Value(k3).(string) = %q, %t want %q, %t`, nm, v, ok, v3, len(v3) != 0)
+		}
+	}
+
+	c0 := Background()
+	check(c0, "c0", "", "", "")
+
+	c1 := WithValue(Background(), k1, "c1k1")
+	check(c1, "c1", "c1k1", "", "")
+
+	if got, want := fmt.Sprint(c1), `context.Background.WithValue(1, "c1k1")`; got != want {
+		t.Errorf("c.String() = %q want %q", got, want)
+	}
+
+	c2 := WithValue(c1, k2, "c2k2")
+	check(c2, "c2", "c1k1", "c2k2", "")
+
+	c3 := WithValue(c2, k3, "c3k3")
+	check(c3, "c2", "c1k1", "c2k2", "c3k3")
+
+	c4 := WithValue(c3, k1, nil)
+	check(c4, "c4", "", "c2k2", "c3k3")
+
+	o0 := otherContext{Background()}
+	check(o0, "o0", "", "", "")
+
+	o1 := otherContext{WithValue(Background(), k1, "c1k1")}
+	check(o1, "o1", "c1k1", "", "")
+
+	o2 := WithValue(o1, k2, "o2k2")
+	check(o2, "o2", "c1k1", "o2k2", "")
+
+	o3 := otherContext{c4}
+	check(o3, "o3", "", "c2k2", "c3k3")
+
+	o4 := WithValue(o3, k3, nil)
+	check(o4, "o4", "", "c2k2", "")
+}
+
+func TestAllocs(t *testing.T) {
+	bg := Background()
+	for _, test := range []struct {
+		desc       string
+		f          func()
+		limit      float64
+		gccgoLimit float64
+	}{
+		{
+			desc:       "Background()",
+			f:          func() { Background() },
+			limit:      0,
+			gccgoLimit: 0,
+		},
+		{
+			desc: fmt.Sprintf("WithValue(bg, %v, nil)", k1),
+			f: func() {
+				c := WithValue(bg, k1, nil)
+				c.Value(k1)
+			},
+			limit:      3,
+			gccgoLimit: 3,
+		},
+		{
+			desc: "WithTimeout(bg, 15*time.Millisecond)",
+			f: func() {
+				c, _ := WithTimeout(bg, 15*time.Millisecond)
+				<-c.Done()
+			},
+			limit:      8,
+			gccgoLimit: 13,
+		},
+		{
+			desc: "WithCancel(bg)",
+			f: func() {
+				c, cancel := WithCancel(bg)
+				cancel()
+				<-c.Done()
+			},
+			limit:      5,
+			gccgoLimit: 8,
+		},
+		{
+			desc: "WithTimeout(bg, 100*time.Millisecond)",
+			f: func() {
+				c, cancel := WithTimeout(bg, 100*time.Millisecond)
+				cancel()
+				<-c.Done()
+			},
+			limit:      8,
+			gccgoLimit: 25,
+		},
+	} {
+		limit := test.limit
+		if runtime.Compiler == "gccgo" {
+			// gccgo does not yet do escape analysis.
+			// TOOD(iant): Remove this when gccgo does do escape analysis.
+			limit = test.gccgoLimit
+		}
+		if n := testing.AllocsPerRun(100, test.f); n > limit {
+			t.Errorf("%s allocs = %f want %d", test.desc, n, int(limit))
+		}
+	}
+}
+
+func TestSimultaneousCancels(t *testing.T) {
+	root, cancel := WithCancel(Background())
+	m := map[Context]CancelFunc{root: cancel}
+	q := []Context{root}
+	// Create a tree of contexts.
+	for len(q) != 0 && len(m) < 100 {
+		parent := q[0]
+		q = q[1:]
+		for i := 0; i < 4; i++ {
+			ctx, cancel := WithCancel(parent)
+			m[ctx] = cancel
+			q = append(q, ctx)
+		}
+	}
+	// Start all the cancels in a random order.
+	var wg sync.WaitGroup
+	wg.Add(len(m))
+	for _, cancel := range m {
+		go func(cancel CancelFunc) {
+			cancel()
+			wg.Done()
+		}(cancel)
+	}
+	// Wait on all the contexts in a random order.
+	for ctx := range m {
+		select {
+		case <-ctx.Done():
+		case <-time.After(1 * time.Second):
+			buf := make([]byte, 10<<10)
+			n := runtime.Stack(buf, true)
+			t.Fatalf("timed out waiting for <-ctx.Done(); stacks:\n%s", buf[:n])
+		}
+	}
+	// Wait for all the cancel functions to return.
+	done := make(chan struct{})
+	go func() {
+		wg.Wait()
+		close(done)
+	}()
+	select {
+	case <-done:
+	case <-time.After(1 * time.Second):
+		buf := make([]byte, 10<<10)
+		n := runtime.Stack(buf, true)
+		t.Fatalf("timed out waiting for cancel functions; stacks:\n%s", buf[:n])
+	}
+}
+
+func TestInterlockedCancels(t *testing.T) {
+	parent, cancelParent := WithCancel(Background())
+	child, cancelChild := WithCancel(parent)
+	go func() {
+		parent.Done()
+		cancelChild()
+	}()
+	cancelParent()
+	select {
+	case <-child.Done():
+	case <-time.After(1 * time.Second):
+		buf := make([]byte, 10<<10)
+		n := runtime.Stack(buf, true)
+		t.Fatalf("timed out waiting for child.Done(); stacks:\n%s", buf[:n])
+	}
+}
+
+func TestLayersCancel(t *testing.T) {
+	testLayers(t, time.Now().UnixNano(), false)
+}
+
+func TestLayersTimeout(t *testing.T) {
+	testLayers(t, time.Now().UnixNano(), true)
+}
+
+func testLayers(t *testing.T, seed int64, testTimeout bool) {
+	rand.Seed(seed)
+	errorf := func(format string, a ...interface{}) {
+		t.Errorf(fmt.Sprintf("seed=%d: %s", seed, format), a...)
+	}
+	const (
+		timeout   = 200 * time.Millisecond
+		minLayers = 30
+	)
+	type value int
+	var (
+		vals      []*value
+		cancels   []CancelFunc
+		numTimers int
+		ctx       = Background()
+	)
+	for i := 0; i < minLayers || numTimers == 0 || len(cancels) == 0 || len(vals) == 0; i++ {
+		switch rand.Intn(3) {
+		case 0:
+			v := new(value)
+			ctx = WithValue(ctx, v, v)
+			vals = append(vals, v)
+		case 1:
+			var cancel CancelFunc
+			ctx, cancel = WithCancel(ctx)
+			cancels = append(cancels, cancel)
+		case 2:
+			var cancel CancelFunc
+			ctx, cancel = WithTimeout(ctx, timeout)
+			cancels = append(cancels, cancel)
+			numTimers++
+		}
+	}
+	checkValues := func(when string) {
+		for _, key := range vals {
+			if val := ctx.Value(key).(*value); key != val {
+				errorf("%s: ctx.Value(%p) = %p want %p", when, key, val, key)
+			}
+		}
+	}
+	select {
+	case <-ctx.Done():
+		errorf("ctx should not be canceled yet")
+	default:
+	}
+	if s, prefix := fmt.Sprint(ctx), "context.Background."; !strings.HasPrefix(s, prefix) {
+		t.Errorf("ctx.String() = %q want prefix %q", s, prefix)
+	}
+	t.Log(ctx)
+	checkValues("before cancel")
+	if testTimeout {
+		select {
+		case <-ctx.Done():
+		case <-time.After(timeout + timeout/10):
+			errorf("ctx should have timed out")
+		}
+		checkValues("after timeout")
+	} else {
+		cancel := cancels[rand.Intn(len(cancels))]
+		cancel()
+		select {
+		case <-ctx.Done():
+		default:
+			errorf("ctx should be canceled")
+		}
+		checkValues("after cancel")
+	}
+}
+
+func TestCancelRemoves(t *testing.T) {
+	checkChildren := func(when string, ctx Context, want int) {
+		if got := len(ctx.(*cancelCtx).children); got != want {
+			t.Errorf("%s: context has %d children, want %d", when, got, want)
+		}
+	}
+
+	ctx, _ := WithCancel(Background())
+	checkChildren("after creation", ctx, 0)
+	_, cancel := WithCancel(ctx)
+	checkChildren("with WithCancel child ", ctx, 1)
+	cancel()
+	checkChildren("after cancelling WithCancel child", ctx, 0)
+
+	ctx, _ = WithCancel(Background())
+	checkChildren("after creation", ctx, 0)
+	_, cancel = WithTimeout(ctx, 60*time.Minute)
+	checkChildren("with WithTimeout child ", ctx, 1)
+	cancel()
+	checkChildren("after cancelling WithTimeout child", ctx, 0)
+}

Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go

@@ -0,0 +1,26 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package context_test
+
+import (
+	"fmt"
+	"time"
+
+	"golang.org/x/net/context"
+)
+
+func ExampleWithTimeout() {
+	// Pass a context with a timeout to tell a blocking function that it
+	// should abandon its work after the timeout elapses.
+	ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	select {
+	case <-time.After(200 * time.Millisecond):
+		fmt.Println("overslept")
+	case <-ctx.Done():
+		fmt.Println(ctx.Err()) // prints "context deadline exceeded"
+	}
+	// Output:
+	// context deadline exceeded
+}

cmd/restic/cmd_mount.go

@@ -0,0 +1,104 @@
+// +build !openbsd
+
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/restic/restic/cmd/restic/fuse"
+
+	systemFuse "bazil.org/fuse"
+	"bazil.org/fuse/fs"
+)
+
+type CmdMount struct {
+	global *GlobalOptions
+	ready  chan struct{}
+	done   chan struct{}
+}
+
+func init() {
+	_, err := parser.AddCommand("mount",
+		"mount a repository",
+		"The mount command mounts a repository read-only to a given directory",
+		&CmdMount{
+			global: &globalOpts,
+			ready:  make(chan struct{}, 1),
+			done:   make(chan struct{}),
+		})
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (cmd CmdMount) Usage() string {
+	return "MOUNTPOINT"
+}
+
+func (cmd CmdMount) Execute(args []string) error {
+	if len(args) == 0 {
+		return fmt.Errorf("wrong number of parameters, Usage: %s", cmd.Usage())
+	}
+
+	repo, err := cmd.global.OpenRepository()
+	if err != nil {
+		return err
+	}
+
+	err = repo.LoadIndex()
+	if err != nil {
+		return err
+	}
+
+	mountpoint := args[0]
+	if _, err := os.Stat(mountpoint); os.IsNotExist(err) {
+		cmd.global.Verbosef("Mountpoint %s doesn't exist, creating it\n", mountpoint)
+		err = os.Mkdir(mountpoint, os.ModeDir|0700)
+		if err != nil {
+			return err
+		}
+	}
+	c, err := systemFuse.Mount(
+		mountpoint,
+		systemFuse.ReadOnly(),
+		systemFuse.FSName("restic"),
+	)
+	if err != nil {
+		return err
+	}
+
+	root := fs.Tree{}
+	root.Add("snapshots", fuse.NewSnapshotsDir(repo))
+
+	cmd.global.Printf("Now serving %s at %s\n", repo.Backend().Location(), mountpoint)
+	cmd.global.Printf("Don't forget to umount after quitting!\n")
+
+	AddCleanupHandler(func() error {
+		return systemFuse.Unmount(mountpoint)
+	})
+
+	cmd.ready <- struct{}{}
+
+	errServe := make(chan error)
+	go func() {
+		err = fs.Serve(c, &root)
+		if err != nil {
+			errServe <- err
+		}
+
+		<-c.Ready
+		errServe <- c.MountError
+	}()
+
+	select {
+	case err := <-errServe:
+		return err
+	case <-cmd.done:
+		err := c.Close()
+		if err != nil {
+			cmd.global.Printf("Error closing fuse connection: %s\n", err)
+		}
+		return systemFuse.Unmount(mountpoint)
+	}
+}

cmd/restic/fuse/dir.go

@@ -0,0 +1,99 @@
+package fuse
+
+import (
+	"os"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+
+	"github.com/restic/restic"
+	"github.com/restic/restic/repository"
+)
+
+// Statically ensure that *dir implement those interface
+var _ = fs.HandleReadDirAller(&dir{})
+var _ = fs.NodeStringLookuper(&dir{})
+
+type dir struct {
+	repo     *repository.Repository
+	children map[string]*restic.Node
+	inode    uint64
+}
+
+func newDir(repo *repository.Repository, node *restic.Node) (*dir, error) {
+	tree, err := restic.LoadTree(repo, node.Subtree)
+	if err != nil {
+		return nil, err
+	}
+	children := make(map[string]*restic.Node)
+	for _, child := range tree.Nodes {
+		children[child.Name] = child
+	}
+
+	return &dir{
+		repo:     repo,
+		children: children,
+		inode:    node.Inode,
+	}, nil
+}
+
+func newDirFromSnapshot(repo *repository.Repository, snapshot SnapshotWithId) (*dir, error) {
+	tree, err := restic.LoadTree(repo, snapshot.Tree)
+	if err != nil {
+		return nil, err
+	}
+	children := make(map[string]*restic.Node)
+	for _, node := range tree.Nodes {
+		children[node.Name] = node
+	}
+
+	return &dir{
+		repo:     repo,
+		children: children,
+		inode:    inodeFromBackendId(snapshot.ID),
+	}, nil
+}
+
+func (d *dir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = d.inode
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+func (d *dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	ret := make([]fuse.Dirent, 0, len(d.children))
+
+	for _, node := range d.children {
+		var typ fuse.DirentType
+		switch {
+		case node.Mode.IsDir():
+			typ = fuse.DT_Dir
+		case node.Mode.IsRegular():
+			typ = fuse.DT_File
+		}
+
+		ret = append(ret, fuse.Dirent{
+			Inode: node.Inode,
+			Type:  typ,
+			Name:  node.Name,
+		})
+	}
+
+	return ret, nil
+}
+
+func (d *dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	child, ok := d.children[name]
+	if !ok {
+		return nil, fuse.ENOENT
+	}
+	switch {
+	case child.Mode.IsDir():
+		return newDir(d.repo, child)
+	case child.Mode.IsRegular():
+		return newFile(d.repo, child)
+	default:
+		return nil, fuse.ENOENT
+	}
+}

cmd/restic/fuse/file.go

@@ -0,0 +1,97 @@
+package fuse
+
+import (
+	"github.com/restic/restic"
+	"github.com/restic/restic/pack"
+	"github.com/restic/restic/repository"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+)
+
+// Statically ensure that *file implements the given interface
+var _ = fs.HandleReader(&file{})
+
+type file struct {
+	repo *repository.Repository
+	node *restic.Node
+
+	sizes []uint32
+	blobs [][]byte
+}
+
+func newFile(repo *repository.Repository, node *restic.Node) (*file, error) {
+	sizes := make([]uint32, len(node.Content))
+	for i, blobId := range node.Content {
+		length, err := repo.Index().LookupSize(blobId)
+		if err != nil {
+			return nil, err
+		}
+		sizes[i] = uint32(length)
+	}
+
+	return &file{
+		repo:  repo,
+		node:  node,
+		sizes: sizes,
+		blobs: make([][]byte, len(node.Content)),
+	}, nil
+}
+
+func (f *file) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = f.node.Inode
+	a.Mode = f.node.Mode
+	a.Size = f.node.Size
+	return nil
+}
+
+func (f *file) getBlobAt(i int) (blob []byte, err error) {
+	if f.blobs[i] != nil {
+		blob = f.blobs[i]
+	} else {
+		blob, err = f.repo.LoadBlob(pack.Data, f.node.Content[i])
+		if err != nil {
+			return nil, err
+		}
+		f.blobs[i] = blob
+	}
+
+	return blob, nil
+}
+
+func (f *file) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
+	off := req.Offset
+
+	// Skip blobs before the offset
+	startContent := 0
+	for off > int64(f.sizes[startContent]) {
+		off -= int64(f.sizes[startContent])
+		startContent++
+	}
+
+	content := make([]byte, req.Size)
+	allContent := content
+	for i := startContent; i < len(f.sizes); i++ {
+		blob, err := f.getBlobAt(i)
+		if err != nil {
+			return err
+		}
+
+		blob = blob[off:]
+		off = 0
+
+		var copied int
+		if len(blob) > len(content) {
+			copied = copy(content[0:], blob[:len(content)])
+		} else {
+			copied = copy(content[0:], blob)
+		}
+		content = content[copied:]
+		if len(content) == 0 {
+			break
+		}
+	}
+	resp.Data = allContent
+	return nil
+}

cmd/restic/fuse/fuse.go

@@ -0,0 +1,14 @@
+package fuse
+
+import (
+	"encoding/binary"
+
+	"github.com/restic/restic/backend"
+)
+
+// inodeFromBackendId returns a unique uint64 from a backend id.
+// Endianness has no specific meaning, it is just the simplest way to
+// transform a []byte to an uint64
+func inodeFromBackendId(id backend.ID) uint64 {
+	return binary.BigEndian.Uint64(id[:8])
+}

cmd/restic/fuse/snapshot.go

@@ -0,0 +1,108 @@
+package fuse
+
+import (
+	"os"
+	"sync"
+	"time"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+
+	"github.com/restic/restic"
+	"github.com/restic/restic/backend"
+	"github.com/restic/restic/repository"
+
+	"golang.org/x/net/context"
+)
+
+type SnapshotWithId struct {
+	*restic.Snapshot
+	backend.ID
+}
+
+// These lines statically ensure that a *SnapshotsDir implement the given
+// interfaces; a misplaced refactoring of the implementation that breaks
+// the interface will be catched by the compiler
+var _ = fs.HandleReadDirAller(&SnapshotsDir{})
+var _ = fs.NodeStringLookuper(&SnapshotsDir{})
+
+type SnapshotsDir struct {
+	repo *repository.Repository
+
+	// knownSnapshots maps snapshot timestamp to the snapshot
+	sync.RWMutex
+	knownSnapshots map[string]SnapshotWithId
+}
+
+func NewSnapshotsDir(repo *repository.Repository) *SnapshotsDir {
+	return &SnapshotsDir{
+		repo:           repo,
+		knownSnapshots: make(map[string]SnapshotWithId),
+	}
+}
+
+func (sn *SnapshotsDir) Attr(ctx context.Context, attr *fuse.Attr) error {
+	attr.Inode = 0
+	attr.Mode = os.ModeDir | 0555
+	return nil
+}
+
+func (sn *SnapshotsDir) updateCache(ctx context.Context) error {
+	sn.Lock()
+	defer sn.Unlock()
+
+	for id := range sn.repo.List(backend.Snapshot, ctx.Done()) {
+		snapshot, err := restic.LoadSnapshot(sn.repo, id)
+		if err != nil {
+			return err
+		}
+		sn.knownSnapshots[snapshot.Time.Format(time.RFC3339)] = SnapshotWithId{snapshot, id}
+	}
+	return nil
+}
+func (sn *SnapshotsDir) get(name string) (snapshot SnapshotWithId, ok bool) {
+	sn.RLock()
+	snapshot, ok = sn.knownSnapshots[name]
+	sn.RUnlock()
+	return snapshot, ok
+}
+
+func (sn *SnapshotsDir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	err := sn.updateCache(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	sn.RLock()
+	defer sn.RUnlock()
+
+	ret := make([]fuse.Dirent, 0)
+	for _, snapshot := range sn.knownSnapshots {
+		ret = append(ret, fuse.Dirent{
+			Inode: inodeFromBackendId(snapshot.ID),
+			Type:  fuse.DT_Dir,
+			Name:  snapshot.Time.Format(time.RFC3339),
+		})
+	}
+
+	return ret, nil
+}
+
+func (sn *SnapshotsDir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	snapshot, ok := sn.get(name)
+
+	if !ok {
+		// We don't know about it, update the cache
+		err := sn.updateCache(ctx)
+		if err != nil {
+			return nil, err
+		}
+		snapshot, ok = sn.get(name)
+		if !ok {
+			// We still don't know about it, this time it really doesn't exist
+			return nil, fuse.ENOENT
+		}
+	}
+
+	return newDirFromSnapshot(sn.repo, snapshot)
+}

cmd/restic/integration_fuse_test.go

@@ -0,0 +1,157 @@
+// +build !openbsd
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/restic/restic"
+	"github.com/restic/restic/backend"
+	"github.com/restic/restic/repository"
+	. "github.com/restic/restic/test"
+)
+
+const (
+	mountWait       = 20
+	mountSleep      = 100 * time.Millisecond
+	mountTestSubdir = "snapshots"
+)
+
+// waitForMount blocks (max mountWait * mountSleep) until the subdir
+// "snapshots" appears in the dir.
+func waitForMount(dir string) error {
+	for i := 0; i < mountWait; i++ {
+		f, err := os.Open(dir)
+		if err != nil {
+			return err
+		}
+
+		names, err := f.Readdirnames(-1)
+		if err != nil {
+			return err
+		}
+
+		if err = f.Close(); err != nil {
+			return err
+		}
+
+		for _, name := range names {
+			if name == mountTestSubdir {
+				return nil
+			}
+		}
+
+		time.Sleep(mountSleep)
+	}
+
+	return fmt.Errorf("subdir %q of dir %s never appeared", mountTestSubdir, dir)
+}
+
+func cmdMount(t testing.TB, global GlobalOptions, dir string, ready, done chan struct{}) {
+	cmd := &CmdMount{global: &global, ready: ready, done: done}
+	OK(t, cmd.Execute([]string{dir}))
+	if TestCleanup {
+		OK(t, os.RemoveAll(dir))
+	}
+}
+
+func TestMount(t *testing.T) {
+	if !RunFuseTest {
+		t.Skip("Skipping fuse tests")
+	}
+
+	checkSnapshots := func(repo *repository.Repository, mountpoint string, snapshotIDs []backend.ID) {
+		snapshotsDir, err := os.Open(filepath.Join(mountpoint, "snapshots"))
+		OK(t, err)
+		namesInSnapshots, err := snapshotsDir.Readdirnames(-1)
+		OK(t, err)
+		Assert(t,
+			len(namesInSnapshots) == len(snapshotIDs),
+			"Invalid number of snapshots: expected %d, got %d", len(snapshotIDs), len(namesInSnapshots))
+
+		namesMap := make(map[string]bool)
+		for _, name := range namesInSnapshots {
+			namesMap[name] = false
+		}
+
+		for _, id := range snapshotIDs {
+			snapshot, err := restic.LoadSnapshot(repo, id)
+			OK(t, err)
+			_, ok := namesMap[snapshot.Time.Format(time.RFC3339)]
+			Assert(t, ok, "Snapshot %s isn't present in fuse dir", snapshot.Time.Format(time.RFC3339))
+			namesMap[snapshot.Time.Format(time.RFC3339)] = true
+		}
+		for name, present := range namesMap {
+			Assert(t, present, "Directory %s is present in fuse dir but is not a snapshot", name)
+		}
+		OK(t, snapshotsDir.Close())
+	}
+
+	withTestEnvironment(t, func(env *testEnvironment, global GlobalOptions) {
+		cmdInit(t, global)
+		repo, err := global.OpenRepository()
+		OK(t, err)
+
+		mountpoint, err := ioutil.TempDir(TestTempDir, "restic-test-mount-")
+		OK(t, err)
+
+		// We remove the mountpoint now to check that cmdMount creates it
+		OK(t, os.RemoveAll(mountpoint))
+
+		ready := make(chan struct{}, 1)
+		done := make(chan struct{})
+		go cmdMount(t, global, mountpoint, ready, done)
+		<-ready
+		defer close(done)
+		OK(t, waitForMount(mountpoint))
+
+		mountpointDir, err := os.Open(mountpoint)
+		OK(t, err)
+		names, err := mountpointDir.Readdirnames(-1)
+		OK(t, err)
+		Assert(t, len(names) == 1 && names[0] == "snapshots", `The fuse virtual directory "snapshots" doesn't exist`)
+		OK(t, mountpointDir.Close())
+
+		checkSnapshots(repo, mountpoint, []backend.ID{})
+
+		datafile := filepath.Join("testdata", "backup-data.tar.gz")
+		fd, err := os.Open(datafile)
+		if os.IsNotExist(err) {
+			t.Skipf("unable to find data file %q, skipping", datafile)
+			return
+		}
+		OK(t, err)
+		OK(t, fd.Close())
+
+		SetupTarTestFixture(t, env.testdata, datafile)
+
+		// first backup
+		cmdBackup(t, global, []string{env.testdata}, nil)
+		snapshotIDs := cmdList(t, global, "snapshots")
+		Assert(t, len(snapshotIDs) == 1,
+			"expected one snapshot, got %v", snapshotIDs)
+
+		checkSnapshots(repo, mountpoint, snapshotIDs)
+
+		// second backup, implicit incremental
+		cmdBackup(t, global, []string{env.testdata}, nil)
+		snapshotIDs = cmdList(t, global, "snapshots")
+		Assert(t, len(snapshotIDs) == 2,
+			"expected two snapshots, got %v", snapshotIDs)
+
+		checkSnapshots(repo, mountpoint, snapshotIDs)
+
+		// third backup, explicit incremental
+		cmdBackup(t, global, []string{env.testdata}, snapshotIDs[0])
+		snapshotIDs = cmdList(t, global, "snapshots")
+		Assert(t, len(snapshotIDs) == 3,
+			"expected three snapshots, got %v", snapshotIDs)
+
+		checkSnapshots(repo, mountpoint, snapshotIDs)
+	})
+}

repository/index.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 
 	"github.com/restic/restic/backend"
+	"github.com/restic/restic/crypto"
 	"github.com/restic/restic/debug"
 	"github.com/restic/restic/pack"
 )
@@ -91,6 +92,16 @@ func (idx *Index) Has(id backend.ID) bool {
 	return false
 }
 
+// LookupSize returns the length of the cleartext content behind the
+// given id
+func (idx *Index) LookupSize(id backend.ID) (cleartextLength uint, err error) {
+	_, _, _, encryptedLength, err := idx.Lookup(id)
+	if err != nil {
+		return 0, err
+	}
+	return encryptedLength - crypto.Extension, nil
+}
+
 // Merge loads all items from other into idx.
 func (idx *Index) Merge(other *Index) {
 	debug.Log("Index.Merge", "Merge index with %p", other)

test/backend.go

@@ -18,6 +18,7 @@ var (
 	TestCleanup           = getBoolVar("RESTIC_TEST_CLEANUP", true)
 	TestTempDir           = getStringVar("RESTIC_TEST_TMPDIR", "")
 	RunIntegrationTest    = getBoolVar("RESTIC_TEST_INTEGRATION", true)
+	RunFuseTest           = getBoolVar("RESTIC_TEST_FUSE", true)
 	TestSFTPPath          = getStringVar("RESTIC_TEST_SFTPPATH", "/usr/lib/ssh:/usr/lib/openssh")
 	TestWalkerPath        = getStringVar("RESTIC_TEST_PATH", ".")
 	BenchArchiveDirectory = getStringVar("RESTIC_BENCH_DIR", ".")