Commit b4c42def authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

Run gofmt.

parent e3ad7b09
...@@ -174,12 +174,12 @@ type pathInode struct { ...@@ -174,12 +174,12 @@ type pathInode struct {
DefaultFsNode DefaultFsNode
} }
func (me *pathInode) LockTree() (func()) { func (me *pathInode) LockTree() func() {
me.pathFs.pathLock.Lock() me.pathFs.pathLock.Lock()
return func() { me.pathFs.pathLock.Unlock() } return func() { me.pathFs.pathLock.Unlock() }
} }
func (me *pathInode) RLockTree() (func()) { func (me *pathInode) RLockTree() func() {
me.pathFs.pathLock.RLock() me.pathFs.pathLock.RLock()
return func() { me.pathFs.pathLock.RUnlock() } return func() { me.pathFs.pathLock.RUnlock() }
} }
......
...@@ -224,7 +224,6 @@ type CreateOut struct { ...@@ -224,7 +224,6 @@ type CreateOut struct {
OpenOut OpenOut
} }
const RELEASE_FLUSH = (1 << 0) const RELEASE_FLUSH = (1 << 0)
type ReleaseIn struct { type ReleaseIn struct {
......
...@@ -163,7 +163,7 @@ type branchResult struct { ...@@ -163,7 +163,7 @@ type branchResult struct {
func printFileInfo(me *os.FileInfo) string { func printFileInfo(me *os.FileInfo) string {
return fmt.Sprintf( return fmt.Sprintf(
"{0%o S=%d L=%d %d:%d %d*%d %d:%d " + "{0%o S=%d L=%d %d:%d %d*%d %d:%d "+
"A %.09f M %.09f C %.09f}", "A %.09f M %.09f C %.09f}",
me.Mode, me.Size, me.Nlink, me.Uid, me.Gid, me.Blocks, me.Blksize, me.Rdev, me.Ino, me.Mode, me.Size, me.Nlink, me.Uid, me.Gid, me.Blocks, me.Blksize, me.Rdev, me.Ino,
float64(me.Atime_ns)*1e-9, float64(me.Mtime_ns)*1e-9, float64(me.Ctime_ns)*1e-9) float64(me.Atime_ns)*1e-9, float64(me.Mtime_ns)*1e-9, float64(me.Ctime_ns)*1e-9)
...@@ -173,7 +173,6 @@ func (me branchResult) String() string { ...@@ -173,7 +173,6 @@ func (me branchResult) String() string {
return fmt.Sprintf("{%s %v branch %d}", printFileInfo(me.attr), me.code, me.branch) return fmt.Sprintf("{%s %v branch %d}", printFileInfo(me.attr), me.code, me.branch)
} }
func (me *UnionFs) getBranchAttrNoCache(name string) branchResult { func (me *UnionFs) getBranchAttrNoCache(name string) branchResult {
name = stripSlash(name) name = stripSlash(name)
......
...@@ -1027,7 +1027,7 @@ func TestFlushRename(t *testing.T) { ...@@ -1027,7 +1027,7 @@ func TestFlushRename(t *testing.T) {
wd, clean := setupUfs(t) wd, clean := setupUfs(t)
defer clean() defer clean()
err := ioutil.WriteFile(wd +"/mount/file", []byte("x"), 0644) err := ioutil.WriteFile(wd+"/mount/file", []byte("x"), 0644)
fn := wd + "/mount/tmp" fn := wd + "/mount/tmp"
f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE, 0644) f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE, 0644)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment