Skip to content

G
go-fuse
Commit aed6ef69 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys
Browse files
Options

Run Gofmt.

parent 2445a2e9
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 100 deletions
example/main.go
View file @ aed6ef69
......@@ -8,6 +8,7 @@ import (
"flag"
"runtime"
)
func main() {
// Scans the arg list and sets up flags
debug := flag.Bool("debug", false, "print debugging messages.")
......@@ -31,7 +32,7 @@ func main() {
if cpus > 1 {
runtime.GOMAXPROCS(cpus)
}
fmt.Printf("Mounted %s on %s (threaded=%v, debug=%v, cpus=%v)\n", orig, mountPoint, *threaded, *debug, cpus)
state.Loop(*threaded)
}
examplelib/stackfs.go
View file @ aed6ef69
......@@ -11,17 +11,17 @@ var _ = fmt.Println
type subFsInfo struct {
// Entry within global FS.
Name string
Fs fuse.RawFileSystem
Fs fuse.RawFileSystem
// Inode in global namespace.
GlobalNodeId uint64
// Maps Fs's Inodes back to the parent inode.
ParentNodeIds map[uint64] uint64
ParentNodeIds map[uint64]uint64
// This must always be the inner lock in the locking order.
ParentNodeIdsLock sync.RWMutex
Attr fuse.Attr
}
......@@ -35,7 +35,7 @@ func (self *subFsInfo) getGlobalNode(node uint64) (uint64, bool) {
func (self *subFsInfo) dropGlobalNode(node uint64) {
self.ParentNodeIdsLock.Lock()
defer self.ParentNodeIdsLock.Unlock()
self.ParentNodeIds[node] = 0, false
self.ParentNodeIds[node] = 0, false
}
func (self *subFsInfo) addGlobalNode(local uint64, global uint64) {
......@@ -47,7 +47,7 @@ func (self *subFsInfo) addGlobalNode(local uint64, global uint64) {
////////////////////////////////////////////////////////////////
type subInodeData struct {
type subInodeData struct {
SubFs *subFsInfo
// NodeId in the sub filesystem.
......@@ -80,11 +80,11 @@ func (self *subInodeData) Deletable() bool {
// /config directory.
type SubmountFileSystem struct {
toplevelEntriesLock sync.RWMutex
toplevelEntries map[string] *subFsInfo
toplevelEntries map[string]*subFsInfo
// Mutex protects map and nextFreeInode.
nodeMapLock sync.RWMutex
nodeMap map[uint64] *subInodeData
nodeMapLock sync.RWMutex
nodeMap map[uint64]*subInodeData
nextFreeInode uint64
Options SubmountFileSystemOptions
......@@ -99,9 +99,9 @@ type SubmountFileSystemOptions struct {
func (self *SubmountFileSystem) registerLookup(subInode uint64, subfs *subFsInfo) (globalNodeId uint64) {
globalNodeId, ok := subfs.getGlobalNode(subInode)
var globalNode *subInodeData = nil
self.nodeMapLock.Lock()
defer self.nodeMapLock.Unlock()
if ok {
......@@ -111,10 +111,10 @@ func (self *SubmountFileSystem) registerLookup(subInode uint64, subfs *subFsInfo
self.nextFreeInode++
globalNode = &subInodeData{
SubFs: subfs,
NodeId: subInode,
SubFs: subfs,
NodeId: subInode,
}
self.nodeMap[globalNodeId] = globalNode
subfs.addGlobalNode(subInode, globalNodeId)
}
......@@ -138,27 +138,27 @@ func (self *SubmountFileSystem) addFileSystem(name string, fs fuse.RawFileSystem
}
subfs := &subFsInfo{
Name: name,
Fs: fs,
Attr: attr,
Name: name,
Fs: fs,
Attr: attr,
}
self.toplevelEntries[name] = subfs
self.nodeMapLock.Lock()
defer self.nodeMapLock.Unlock()
self.nodeMap[self.nextFreeInode] = &subInodeData{
SubFs: subfs,
NodeId: fuse.FUSE_ROOT_ID,
LookupCount: 0,
SubFs: subfs,
NodeId: fuse.FUSE_ROOT_ID,
LookupCount: 0,
}
subfs.ParentNodeIds = map[uint64]uint64{ fuse.FUSE_ROOT_ID: self.nextFreeInode }
subfs.ParentNodeIds = map[uint64]uint64{fuse.FUSE_ROOT_ID: self.nextFreeInode}
subfs.GlobalNodeId = self.nextFreeInode
subfs.Attr.Mode |= fuse.S_IFDIR
subfs.Attr.Ino = self.nextFreeInode
self.nextFreeInode++
return true
......@@ -167,25 +167,25 @@ func (self *SubmountFileSystem) addFileSystem(name string, fs fuse.RawFileSystem
func (self *SubmountFileSystem) removeFileSystem(name string) *subFsInfo {
self.toplevelEntriesLock.Lock()
defer self.toplevelEntriesLock.Unlock()
subfs, ok := self.toplevelEntries[name]
if !ok {
return nil
}
self.toplevelEntries[name] = nil, false
self.toplevelEntries[name] = nil, false
// We leave the keys of node map as is, since the kernel may
// still issue requests with nodeids in it.
self.nodeMapLock.Lock()
defer self.nodeMapLock.Unlock()
for _, v := range(self.nodeMap) {
for _, v := range self.nodeMap {
if v.SubFs == subfs {
v.SubFs = nil
}
}
return subfs
}
......@@ -197,7 +197,7 @@ func (self *SubmountFileSystem) listFileSystems() ([]string, []uint32) {
modes := make([]uint32, len(self.toplevelEntries))
j := 0
for name, entry := range (self.toplevelEntries) {
for name, entry := range self.toplevelEntries {
names[j] = name
modes[j] = entry.Attr.Mode
j++
......@@ -216,21 +216,21 @@ func (self *SubmountFileSystem) lookupRoot(name string) (out *fuse.EntryOut, cod
fuse.SplitNs(self.Options.NegativeTimeout, &out.EntryValid, &out.EntryValidNsec)
return nil, fuse.ENOENT
}
self.nodeMapLock.RLock()
dentry, ok := self.nodeMap[subfs.GlobalNodeId]
self.nodeMapLock.RUnlock()
if !ok {
panic(fmt.Sprintf("unknown toplevel node %d", subfs.GlobalNodeId))
}
dentry.LookupCount++
out = new(fuse.EntryOut)
out.NodeId = subfs.GlobalNodeId
out.Attr = subfs.Attr
fuse.SplitNs(self.Options.EntryTimeout, &out.EntryValid, &out.EntryValidNsec)
fuse.SplitNs(self.Options.AttrTimeout, &out.AttrValid, &out.AttrValidNsec)
......@@ -240,7 +240,7 @@ func (self *SubmountFileSystem) lookupRoot(name string) (out *fuse.EntryOut, cod
func (self *SubmountFileSystem) forget(h *fuse.InHeader, input *fuse.ForgetIn) *subInodeData {
self.nodeMapLock.Lock()
defer self.nodeMapLock.Unlock()
subNodeData := self.nodeMap[h.NodeId]
globalNodeId := h.NodeId
......@@ -254,7 +254,7 @@ func (self *SubmountFileSystem) forget(h *fuse.InHeader, input *fuse.ForgetIn) *
return subNodeData
}
////////////////////////////////////////////////////////////////
// Functions below should not need locking primitives.
......@@ -306,11 +306,11 @@ func (self *SubmountFileSystem) Forget(h *fuse.InHeader, input *fuse.ForgetIn) {
}
}
func NewSubmountFileSystem() (*SubmountFileSystem) {
func NewSubmountFileSystem() *SubmountFileSystem {
out := new(SubmountFileSystem)
out.nextFreeInode = fuse.FUSE_ROOT_ID + 1
out.nodeMap = make(map[uint64] *subInodeData)
out.toplevelEntries = make(map[string] *subFsInfo)
out.nodeMap = make(map[uint64]*subInodeData)
out.toplevelEntries = make(map[string]*subFsInfo)
out.Options.TimeoutOptions = fuse.MakeTimeoutOptions()
return out
}
......@@ -321,7 +321,7 @@ func (self *SubmountFileSystem) Init(h *fuse.InHeader, input *fuse.InitIn) (*fus
}
func (self *SubmountFileSystem) Destroy(h *fuse.InHeader, input *fuse.InitIn) {
for _, v := range(self.toplevelEntries) {
for _, v := range self.toplevelEntries {
v.Fs.Destroy(h, input)
}
}
......@@ -333,7 +333,7 @@ func (self *SubmountFileSystem) GetAttr(header *fuse.InHeader, input *fuse.GetAt
// TODO - what to answer for this?
out.Attr.Mode = fuse.S_IFDIR | 0755
return out, fuse.OK
}
}
subId, subfs := self.getSubFs(header.NodeId)
if subfs == nil {
return nil, fuse.ENOENT
......@@ -345,12 +345,12 @@ func (self *SubmountFileSystem) GetAttr(header *fuse.InHeader, input *fuse.GetAt
out.Attr = subfs.Attr
return out, fuse.OK
}
header.NodeId = subId
out, code = subfs.Fs.GetAttr(header, input)
if out != nil {
out.Attr.Ino, _ = subfs.getGlobalNode(out.Ino)
out.Attr.Ino, _ = subfs.getGlobalNode(out.Ino)
}
return out, code
}
......@@ -361,7 +361,7 @@ func (self *SubmountFileSystem) Open(header *fuse.InHeader, input *fuse.OpenIn)
if subfs == nil {
return 0, nil, fuse.ENOENT
}
return subfs.Fs.Open(header, input)
}
......@@ -371,7 +371,7 @@ func (self *SubmountFileSystem) SetAttr(header *fuse.InHeader, input *fuse.SetAt
if subfs == nil {
return nil, fuse.ENOENT
}
out, code = subfs.Fs.SetAttr(header, input)
if out != nil {
out.Attr.Ino, _ = subfs.getGlobalNode(out.Ino)
......@@ -409,7 +409,7 @@ func (self *SubmountFileSystem) Mkdir(header *fuse.InHeader, input *fuse.MkdirIn
// ENOSYS ?
return nil, fuse.EPERM
}
var subfs *subFsInfo
header.NodeId, subfs = self.getSubFs(header.NodeId)
if subfs == nil {
......@@ -430,7 +430,7 @@ func (self *SubmountFileSystem) Unlink(header *fuse.InHeader, name string) (code
// ENOSYS ?
return fuse.EPERM
}
var subfs *subFsInfo
header.NodeId, subfs = self.getSubFs(header.NodeId)
if subfs == nil {
......@@ -445,7 +445,7 @@ func (self *SubmountFileSystem) Rmdir(header *fuse.InHeader, name string) (code
// ENOSYS ?
return fuse.EPERM
}
var subfs *subFsInfo
header.NodeId, subfs = self.getSubFs(header.NodeId)
if subfs == nil {
......@@ -459,13 +459,13 @@ func (self *SubmountFileSystem) Symlink(header *fuse.InHeader, pointedTo string,
// ENOSYS ?
return nil, fuse.EPERM
}
var subfs *subFsInfo
header.NodeId, subfs = self.getSubFs(header.NodeId)
if subfs == nil {
return nil, fuse.ENOENT
}
out, code = subfs.Fs.Symlink(header, pointedTo, linkName)
if out != nil {
out.NodeId = self.registerLookup(out.NodeId, subfs)
......@@ -475,7 +475,7 @@ func (self *SubmountFileSystem) Symlink(header *fuse.InHeader, pointedTo string,
}
func (self *SubmountFileSystem) Rename(header *fuse.InHeader, input *fuse.RenameIn, oldName string, newName string) (code fuse.Status) {
if header.NodeId == fuse.FUSE_ROOT_ID || input.Newdir == fuse.FUSE_ROOT_ID {
if header.NodeId == fuse.FUSE_ROOT_ID || input.Newdir == fuse.FUSE_ROOT_ID {
// ENOSYS ?
return fuse.EPERM
}
......@@ -485,7 +485,7 @@ func (self *SubmountFileSystem) Rename(header *fuse.InHeader, input *fuse.Rename
if subfs == nil {
return fuse.ENOENT
}
return subfs.Fs.Rename(header, input, oldName, newName)
}
......@@ -495,7 +495,7 @@ func (self *SubmountFileSystem) Link(header *fuse.InHeader, input *fuse.LinkIn,
if subfs == nil {
return nil, fuse.ENOENT
}
out, code = subfs.Fs.Link(header, input, name)
if out != nil {
out.NodeId = self.registerLookup(out.NodeId, subfs)
......@@ -510,13 +510,13 @@ func (self *SubmountFileSystem) SetXAttr(header *fuse.InHeader, input *fuse.SetX
if subfs == nil {
return fuse.ENOENT
}
return subfs.Fs.SetXAttr(header, input)
}
func (self *SubmountFileSystem) GetXAttr(header *fuse.InHeader, input *fuse.GetXAttrIn) (out *fuse.GetXAttrOut, code fuse.Status) {
var subfs *subFsInfo
header.NodeId, subfs = self.getSubFs(header.NodeId)
header.NodeId, subfs = self.getSubFs(header.NodeId)
if subfs == nil {
return nil, fuse.ENOENT
}
......@@ -535,7 +535,7 @@ func (self *SubmountFileSystem) Create(header *fuse.InHeader, input *fuse.Create
// ENOSYS ?
return 0, nil, nil, fuse.EPERM
}
var subfs *subFsInfo
header.NodeId, subfs = self.getSubFs(header.NodeId)
if subfs == nil {
......@@ -546,7 +546,7 @@ func (self *SubmountFileSystem) Create(header *fuse.InHeader, input *fuse.Create
out.NodeId = self.registerLookup(out.NodeId, subfs)
out.Attr.Ino = out.NodeId
}
return flags, fuseFile, out, code
}
......@@ -579,12 +579,12 @@ func (self *SubmountFileSystem) Poll(header *fuse.InHeader, input *fuse.PollIn)
}
func (self *SubmountFileSystem) OpenDir(header *fuse.InHeader, input *fuse.OpenIn) (flags uint32, fuseFile fuse.RawFuseDir, status fuse.Status) {
if (header.NodeId == fuse.FUSE_ROOT_ID) {
if header.NodeId == fuse.FUSE_ROOT_ID {
return 0, NewSubmountFileSystemTopDir(self), fuse.OK
}
// TODO - we have to parse and unparse the readdir results, to substitute inodes.
var subfs *subFsInfo
header.NodeId, subfs = self.getSubFs(header.NodeId)
if subfs == nil {
......@@ -596,14 +596,14 @@ func (self *SubmountFileSystem) OpenDir(header *fuse.InHeader, input *fuse.OpenI
////////////////////////////////////////////////////////////////
type SubmountFileSystemTopDir struct {
names []string
modes []uint32
names []string
modes []uint32
nextRead int
}
func NewSubmountFileSystemTopDir(fs *SubmountFileSystem) *SubmountFileSystemTopDir {
out := new(SubmountFileSystemTopDir)
out.names, out.modes = fs.listFileSystems()
return out
}
......@@ -613,7 +613,7 @@ func (self *SubmountFileSystemTopDir) ReadDir(input *fuse.ReadIn) (*fuse.DirEntr
for self.nextRead < len(self.names) {
i := self.nextRead
if (de.AddString(self.names[i], fuse.FUSE_UNKNOWN_INO, self.modes[i])) {
if de.AddString(self.names[i], fuse.FUSE_UNKNOWN_INO, self.modes[i]) {
self.nextRead++
} else {
break
......@@ -629,5 +629,3 @@ func (self *SubmountFileSystemTopDir) ReleaseDir() {
func (self *SubmountFileSystemTopDir) FsyncDir(input *fuse.FsyncIn) (code fuse.Status) {
return fuse.ENOENT
}
examplelib/stackfs_test.go
View file @ aed6ef69
......@@ -34,14 +34,14 @@ func FileExists(name string) bool {
const magicMode uint32 = 0753
type testCase struct {
origDir1 string
origDir2 string
mountDir string
testDir string
tester *testing.T
fs *SubmountFileSystem
state *fuse.MountState
origDir1 string
origDir2 string
mountDir string
testDir string
tester *testing.T
fs *SubmountFileSystem
state *fuse.MountState
}
func (self *testCase) Setup(t *testing.T) {
......@@ -55,19 +55,19 @@ func (self *testCase) Setup(t *testing.T) {
os.Mkdir(self.origDir1, 0700)
os.Mkdir(self.origDir2, 0700)
os.Mkdir(self.mountDir, 0700)
fs1 := fuse.NewPathFileSystemConnector(NewPassThroughFuse(self.origDir1))
fs2 := fuse.NewPathFileSystemConnector(NewPassThroughFuse(self.origDir2))
self.fs = NewSubmountFileSystem()
attr := fuse.Attr{
Mode: uint32(magicMode),
Mode: uint32(magicMode),
}
self.fs.AddFileSystem("sub1", fs1, attr)
self.fs.AddFileSystem("sub2", fs2, attr)
self.state = fuse.NewMountState(self.fs)
self.state.Mount(self.mountDir)
......@@ -102,7 +102,7 @@ func (self *testCase) testReaddir() {
if err != nil {
self.tester.Errorf("readdir err %v", err)
}
wanted := map[string]bool{
"sub1": true,
"sub2": true,
......@@ -116,7 +116,7 @@ func (self *testCase) testReaddir() {
self.tester.Errorf("Unexpected name %v", v.Name)
}
if v.Mode & 0777 != magicMode {
if v.Mode&0777 != magicMode {
self.tester.Errorf("Unexpected mode %o, %v", v.Mode, v)
}
}
......@@ -133,7 +133,7 @@ func (self *testCase) testSubFs() {
mount := path.Join(self.mountDir, fmt.Sprintf("sub%d", i))
name := "testFile"
mountFile := path.Join(mount, name)
f, err := os.Open(mountFile, os.O_WRONLY, 0)
......@@ -142,9 +142,9 @@ func (self *testCase) testSubFs() {
continue
}
content1 := "booh!"
f, err = os.Open(mountFile, os.O_WRONLY | os.O_CREATE, magicMode)
f, err = os.Open(mountFile, os.O_WRONLY|os.O_CREATE, magicMode)
if err != nil {
self.tester.Errorf("Create %v", err)
self.tester.Errorf("Create %v", err)
}
f.Write([]byte(content1))
......@@ -152,21 +152,21 @@ func (self *testCase) testSubFs() {
err = os.Chmod(mountFile, magicMode)
if err != nil {
self.tester.Errorf("chmod %v", err)
self.tester.Errorf("chmod %v", err)
}
fi, err := os.Lstat(mountFile)
if err != nil {
self.tester.Errorf("Lstat %v", err)
self.tester.Errorf("Lstat %v", err)
} else {
if fi.Mode & 0777 != magicMode {
self.tester.Errorf("Mode %o", fi.Mode)
if fi.Mode&0777 != magicMode {
self.tester.Errorf("Mode %o", fi.Mode)
}
}
g, err := os.Open(mountFile, os.O_RDONLY, 0)
if err != nil {
self.tester.Errorf("Open %v", err)
self.tester.Errorf("Open %v", err)
} else {
buf := make([]byte, 1024)
n, err := g.Read(buf)
......@@ -184,7 +184,7 @@ func (self *testCase) testSubFs() {
func (self *testCase) testAddRemove() {
self.tester.Log("testAddRemove")
attr := fuse.Attr{
Mode:0755,
Mode: 0755,
}
conn := fuse.NewPathFileSystemConnector(NewPassThroughFuse(self.origDir1))
......@@ -197,8 +197,8 @@ func (self *testCase) testAddRemove() {
if !ok {
self.tester.Errorf("AddFileSystem fail")
}
conn.Init(new(fuse.InHeader), new(fuse.InitIn))
conn.Init(new(fuse.InHeader), new(fuse.InitIn))
fi, err := os.Lstat(path.Join(self.mountDir, "third"))
if err != nil {
self.tester.Errorf("third lstat err %v", err)
......
fuse/fuse.go
View file @ aed6ef69
......@@ -14,7 +14,7 @@ import (
// TODO make generic option setting.
const (
maxRead = (1 << 16)
maxRead = (1 << 16)
bufSize = maxRead + 1024
)
......
fuse/misc.go
View file @ aed6ef69
......@@ -272,14 +272,14 @@ func Writev(fd int, packet [][]byte) (n int, err os.Error) {
func CountCpus() int {
var contents [10240]byte
f, err := os.Open("/proc/stat", os.O_RDONLY, 0)
defer f.Close()
if err != nil {
return 1
return 1
}
n, _ := f.Read(contents[:])
re, _ := regexp.Compile("\ncpu[0-9]")
return len(re.FindAllString(string(contents[:n]), 100))
}
fuse/pathfilesystem.go
View file @ aed6ef69
......@@ -55,9 +55,9 @@ type TimeoutOptions struct {
func MakeTimeoutOptions() TimeoutOptions {
return TimeoutOptions{
NegativeTimeout: 0.0,
AttrTimeout: 1.0,
EntryTimeout: 1.0,
NegativeTimeout: 0.0,
AttrTimeout: 1.0,
EntryTimeout: 1.0,
}
}
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7