Move CreateIn.

fuse/api.go

@@ -276,7 +276,7 @@ type RawFileSystem interface {
 	RemoveXAttr(header *InHeader, attr string) (code Status)
 
 	// File handling.
-	Create(header *InHeader, input *CreateIn, name string) (flags uint32, handle uint64, out *EntryOut, code Status)
+	Create(header *InHeader, input *raw.CreateIn, name string) (flags uint32, handle uint64, out *EntryOut, code Status)
 	Open(header *InHeader, input *raw.OpenIn) (flags uint32, handle uint64, status Status)
 	Read(*InHeader, *ReadIn, BufferPool) ([]byte, Status)
 

fuse/defaultraw.go

@@ -86,7 +86,7 @@ func (me *DefaultRawFileSystem) Access(header *InHeader, input *raw.AccessIn) (c
 	return ENOSYS
 }
 
-func (me *DefaultRawFileSystem) Create(header *InHeader, input *CreateIn, name string) (flags uint32, handle uint64, out *EntryOut, code Status) {
+func (me *DefaultRawFileSystem) Create(header *InHeader, input *raw.CreateIn, name string) (flags uint32, handle uint64, out *EntryOut, code Status) {
 	return 0, 0, nil, ENOSYS
 }
 

fuse/fsops.go

@@ -267,7 +267,7 @@ func (me *FileSystemConnector) Access(header *InHeader, input *raw.AccessIn) (co
 	return n.fsInode.Access(input.Mask, &header.Context)
 }
 
-func (me *FileSystemConnector) Create(header *InHeader, input *CreateIn, name string) (flags uint32, h uint64, out *EntryOut, code Status) {
+func (me *FileSystemConnector) Create(header *InHeader, input *raw.CreateIn, name string) (flags uint32, h uint64, out *EntryOut, code Status) {
 	parent := me.toInode(header.NodeId)
 	f, fi, fsNode, code := parent.fsInode.Create(name, uint32(input.Flags), input.Mode, &header.Context)
 	if !code.Ok() {

fuse/lockingfs.go

@@ -255,7 +255,7 @@ func (me *LockingRawFileSystem) Access(header *InHeader, input *raw.AccessIn) (c
 	return me.RawFileSystem.Access(header, input)
 }
 
-func (me *LockingRawFileSystem) Create(header *InHeader, input *CreateIn, name string) (flags uint32, handle uint64, out *EntryOut, code Status) {
+func (me *LockingRawFileSystem) Create(header *InHeader, input *raw.CreateIn, name string) (flags uint32, handle uint64, out *EntryOut, code Status) {
 	defer me.locked()()
 	return me.RawFileSystem.Create(header, input, name)
 }

fuse/opcode.go

@@ -120,7 +120,7 @@ func doOpen(state *MountState, req *request) {
 }
 
 func doCreate(state *MountState, req *request) {
-	flags, handle, entry, status := state.fileSystem.Create(req.inHeader, (*CreateIn)(req.inData), req.filenames[0])
+	flags, handle, entry, status := state.fileSystem.Create(req.inHeader, (*raw.CreateIn)(req.inData), req.filenames[0])
 	req.status = status
 	if status.Ok() {
 		req.outData = unsafe.Pointer(&CreateOut{
@@ -411,7 +411,7 @@ func init() {
 		_OP_RELEASEDIR:   unsafe.Sizeof(raw.ReleaseIn{}),
 		_OP_FSYNCDIR:     unsafe.Sizeof(raw.FsyncIn{}),
 		_OP_ACCESS:       unsafe.Sizeof(raw.AccessIn{}),
-		_OP_CREATE:       unsafe.Sizeof(CreateIn{}),
+		_OP_CREATE:       unsafe.Sizeof(raw.CreateIn{}),
 		_OP_INTERRUPT:    unsafe.Sizeof(raw.InterruptIn{}),
 		_OP_BMAP:         unsafe.Sizeof(raw.BmapIn{}),
 		_OP_IOCTL:        unsafe.Sizeof(raw.IoctlIn{}),
@@ -555,7 +555,7 @@ func init() {
 		_OP_IOCTL:        func(ptr unsafe.Pointer) interface{} { return (*raw.IoctlIn)(ptr) },
 		_OP_OPEN:         func(ptr unsafe.Pointer) interface{} { return (*raw.OpenIn)(ptr) },
 		_OP_MKNOD:        func(ptr unsafe.Pointer) interface{} { return (*raw.MknodIn)(ptr) },
-		_OP_CREATE:       func(ptr unsafe.Pointer) interface{} { return (*CreateIn)(ptr) },
+		_OP_CREATE:       func(ptr unsafe.Pointer) interface{} { return (*raw.CreateIn)(ptr) },
 		_OP_READ:         func(ptr unsafe.Pointer) interface{} { return (*ReadIn)(ptr) },
 		_OP_READDIR:      func(ptr unsafe.Pointer) interface{} { return (*ReadIn)(ptr) },
 		_OP_ACCESS:       func(ptr unsafe.Pointer) interface{} { return (*raw.AccessIn)(ptr) },

fuse/typeprint.go

@@ -39,12 +39,6 @@ func (me *AttrOut) String() string {
 		me.AttrValid, me.AttrValidNsec, &me.Attr)
 }
 
-func (me *CreateIn) String() string {
-	return fmt.Sprintf(
-		"{0%o [%s] (0%o)}", me.Mode,
-		raw.FlagString(raw.OpenFlagNames, int(me.Flags), "O_RDONLY"), me.Umask)
-}
-
 func (me *EntryOut) String() string {
 	return fmt.Sprintf("{%d E%d.%09d A%d.%09d %v}",
 		me.NodeId, me.EntryValid, me.EntryValidNsec,

fuse/types.go

@@ -124,13 +124,6 @@ type AttrOut struct {
 	Attr
 }
 
-type CreateIn struct {
-	Flags   uint32
-	Mode    uint32
-	Umask   uint32
-	Padding uint32
-}
-
 type CreateOut struct {
 	EntryOut
 	raw.OpenOut

raw/print.go

@@ -170,3 +170,9 @@ func (me *AccessIn) String() string {
 	return fmt.Sprintf("{%s}", FlagString(accessFlagName, int(me.Mask), ""))
 }
 
+func (me *CreateIn) String() string {
+	return fmt.Sprintf(
+		"{0%o [%s] (0%o)}", me.Mode,
+		FlagString(OpenFlagNames, int(me.Flags), "O_RDONLY"), me.Umask)
+}
+

raw/types.go

@@ -276,3 +276,10 @@ type OutHeader struct {
 	Status int32
 	Unique uint64
 }
+
+type CreateIn struct {
+	Flags   uint32
+	Mode    uint32
+	Umask   uint32
+	Padding uint32
+}