vitalif
/
fusego
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed several more build errors.

geesefs-0-30-9
Aaron Jacobs 2015-07-27 14:33:19 +10:00
parent b78e8f91d7
commit 2b8c659517
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
conversions.go
View File

@ -44,17 +44,15 @@ func convertInMessage(
} }
to := &fuseops.LookUpInodeOp{ to := &fuseops.LookUpInodeOp{
protocol: protocol, Parent: fuseops.InodeID(m.Header().Nodeid),
Parent: InodeID(m.Header().Nodeid), Name: string(buf[:n-1]),
Name: string(buf[:n-1]),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
case fusekernel.OpGetattr: case fusekernel.OpGetattr:
to := &fuseops.GetInodeAttributesOp{ to := &fuseops.GetInodeAttributesOp{
protocol: protocol, Inode: fuseops.InodeID(m.Header().Nodeid),
Inode: InodeID(m.Header().Nodeid),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
@ -68,8 +66,7 @@ func convertInMessage(
} }
to := &fuseops.SetInodeAttributesOp{ to := &fuseops.SetInodeAttributesOp{
protocol: protocol, Inode: fuseops.InodeID(m.Header().Nodeid),
Inode: InodeID(m.Header().Nodeid),
} }
valid := fusekernel.SetattrValid(in.Valid) valid := fusekernel.SetattrValid(in.Valid)
@ -104,7 +101,7 @@ func convertInMessage(
} }
to := &fuseops.ForgetInodeOp{ to := &fuseops.ForgetInodeOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
N: in.Nlookup, N: in.Nlookup,
} }
io = to io = to
@ -126,9 +123,8 @@ func convertInMessage(
name = name[:i] name = name[:i]
to := &fuseops.MkDirOp{ to := &fuseops.MkDirOp{
protocol: protocol, Parent: fuseops.InodeID(m.Header().Nodeid),
Parent: InodeID(m.Header().Nodeid), Name: string(name),
Name: string(name),
// On Linux, vfs_mkdir calls through to the inode with at most // On Linux, vfs_mkdir calls through to the inode with at most
// permissions and sticky bits set (cf. https://goo.gl/WxgQXk), and fuse // permissions and sticky bits set (cf. https://goo.gl/WxgQXk), and fuse
@ -158,10 +154,9 @@ func convertInMessage(
name = name[:i] name = name[:i]
to := &fuseops.CreateFileOp{ to := &fuseops.CreateFileOp{
protocol: protocol, Parent: fuseops.InodeID(m.Header().Nodeid),
Parent: InodeID(m.Header().Nodeid), Name: string(name),
Name: string(name), Mode: convertFileMode(in.Mode),
Mode: convertFileMode(in.Mode),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
@ -181,10 +176,9 @@ func convertInMessage(
newName, target := names[0:i], names[i+1:len(names)-1] newName, target := names[0:i], names[i+1:len(names)-1]
to := &fuseops.CreateSymlinkOp{ to := &fuseops.CreateSymlinkOp{
protocol: protocol, Parent: fuseops.InodeID(m.Header().Nodeid),
Parent: InodeID(m.Header().Nodeid), Name: string(newName),
Name: string(newName), Target: string(target),
Target: string(target),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
@ -215,9 +209,9 @@ func convertInMessage(
oldName, newName := names[:i], names[i+1:len(names)-1] oldName, newName := names[:i], names[i+1:len(names)-1]
to := &fuseops.RenameOp{ to := &fuseops.RenameOp{
OldParent: InodeID(m.Header().Nodeid), OldParent: fuseops.InodeID(m.Header().Nodeid),
OldName: string(oldName), OldName: string(oldName),
NewParent: InodeID(in.Newdir), NewParent: fuseops.InodeID(in.Newdir),
NewName: string(newName), NewName: string(newName),
} }
io = to io = to
@ -232,7 +226,7 @@ func convertInMessage(
} }
to := &fuseops.UnlinkOp{ to := &fuseops.UnlinkOp{
Parent: InodeID(m.Header().Nodeid), Parent: fuseops.InodeID(m.Header().Nodeid),
Name: string(buf[:n-1]), Name: string(buf[:n-1]),
} }
io = to io = to
@ -247,7 +241,7 @@ func convertInMessage(
} }
to := &fuseops.RmDirOp{ to := &fuseops.RmDirOp{
Parent: InodeID(m.Header().Nodeid), Parent: fuseops.InodeID(m.Header().Nodeid),
Name: string(buf[:n-1]), Name: string(buf[:n-1]),
} }
io = to io = to
@ -255,14 +249,14 @@ func convertInMessage(
case fusekernel.OpOpen: case fusekernel.OpOpen:
to := &fuseops.OpenFileOp{ to := &fuseops.OpenFileOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
case fusekernel.OpOpendir: case fusekernel.OpOpendir:
to := &fuseops.OpenDirOp{ to := &fuseops.OpenDirOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
@ -275,7 +269,7 @@ func convertInMessage(
} }
to := &fuseops.ReadFileOp{ to := &fuseops.ReadFileOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
Handle: HandleID(in.Fh), Handle: HandleID(in.Fh),
Offset: int64(in.Offset), Offset: int64(in.Offset),
Size: int(in.Size), Size: int(in.Size),
@ -291,7 +285,7 @@ func convertInMessage(
} }
to := &fuseops.ReadDirOp{ to := &fuseops.ReadDirOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
Handle: HandleID(in.Fh), Handle: HandleID(in.Fh),
Offset: DirOffset(in.Offset), Offset: DirOffset(in.Offset),
Size: int(in.Size), Size: int(in.Size),
@ -341,7 +335,7 @@ func convertInMessage(
} }
to := &fuseops.WriteFileOp{ to := &fuseops.WriteFileOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
Handle: HandleID(in.Fh), Handle: HandleID(in.Fh),
Data: buf, Data: buf,
Offset: int64(in.Offset), Offset: int64(in.Offset),
@ -358,7 +352,7 @@ func convertInMessage(
} }
to := &fuseops.SyncFileOp{ to := &fuseops.SyncFileOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
Handle: HandleID(in.Fh), Handle: HandleID(in.Fh),
} }
io = to io = to
@ -373,7 +367,7 @@ func convertInMessage(
} }
to := &fuseops.FlushFileOp{ to := &fuseops.FlushFileOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
Handle: HandleID(in.Fh), Handle: HandleID(in.Fh),
} }
io = to io = to
@ -381,7 +375,7 @@ func convertInMessage(
case fusekernel.OpReadlink: case fusekernel.OpReadlink:
to := &fuseops.ReadSymlinkOp{ to := &fuseops.ReadSymlinkOp{
Inode: InodeID(m.Header().Nodeid), Inode: fuseops.InodeID(m.Header().Nodeid),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
@ -424,7 +418,7 @@ func convertInMessage(
default: default:
to := &unknownOp{ to := &unknownOp{
opCode: m.Header().Opcode, opCode: m.Header().Opcode,
inode: InodeID(m.Header().Nodeid), inode: fuseops.InodeID(m.Header().Nodeid),
} }
io = to io = to
co = &to.commonOp co = &to.commonOp
@ -450,7 +444,7 @@ func convertTime(t time.Time) (secs uint64, nsec uint32) {
} }
func convertAttributes( func convertAttributes(
inodeID InodeID, inodeID fuseops.InodeID,
in *InodeAttributes, in *InodeAttributes,
out *fusekernel.Attr) { out *fusekernel.Attr) {
out.Ino = uint64(inodeID) out.Ino = uint64(inodeID)