Commit bf8e5104 authored by Jille Timmermans's avatar Jille Timmermans

Update to fuse 7.12

7.12 also allows usage of invalidation

Change-Id: I6e0480b7454187160f0b9f4b018386ba650048b7
parent 17a864ed
...@@ -23,4 +23,5 @@ func (a *Attr) FromStat(s *syscall.Stat_t) { ...@@ -23,4 +23,5 @@ func (a *Attr) FromStat(s *syscall.Stat_t) {
a.Uid = uint32(s.Uid) a.Uid = uint32(s.Uid)
a.Gid = uint32(s.Gid) a.Gid = uint32(s.Gid)
a.Rdev = uint32(s.Rdev) a.Rdev = uint32(s.Rdev)
a.Blksize = uint32(s.Blksize)
} }
...@@ -18,13 +18,13 @@ func (a *Attr) string() string { ...@@ -18,13 +18,13 @@ func (a *Attr) string() string {
return fmt.Sprintf( return fmt.Sprintf(
"{M0%o SZ=%d L=%d "+ "{M0%o SZ=%d L=%d "+
"%d:%d "+ "%d:%d "+
"%d %d:%d "+ "B%d*%d i%d:%d "+
"A %f "+ "A %f "+
"M %f "+ "M %f "+
"C %f}", "C %f}",
a.Mode, a.Size, a.Nlink, a.Mode, a.Size, a.Nlink,
a.Uid, a.Gid, a.Uid, a.Gid,
a.Blocks, a.Blocks, a.Blksize,
a.Rdev, a.Ino, ft(a.Atime, a.Atimensec), ft(a.Mtime, a.Mtimensec), a.Rdev, a.Ino, ft(a.Atime, a.Atimensec), ft(a.Mtime, a.Mtimensec),
ft(a.Ctime, a.Ctimensec)) ft(a.Ctime, a.Ctimensec))
} }
......
...@@ -8,6 +8,6 @@ const outputHeaderSize = 200 ...@@ -8,6 +8,6 @@ const outputHeaderSize = 200
const ( const (
_FUSE_KERNEL_VERSION = 7 _FUSE_KERNEL_VERSION = 7
_MINIMUM_MINOR_VERSION = 8 _MINIMUM_MINOR_VERSION = 12
_OUR_MINOR_VERSION = 8 _OUR_MINOR_VERSION = 12
) )
...@@ -30,8 +30,10 @@ type Attr struct { ...@@ -30,8 +30,10 @@ type Attr struct {
Mode uint32 Mode uint32
Nlink uint32 Nlink uint32
Owner Owner
Rdev uint32 Rdev uint32
Flags_ uint32 // OS X Flags_ uint32 // OS X
Blksize uint32
Padding uint32
} }
const ( const (
...@@ -67,38 +69,52 @@ const ( ...@@ -67,38 +69,52 @@ const (
type GetAttrIn struct { type GetAttrIn struct {
InHeader InHeader
Flags_ uint32
Dummy uint32
Fh_ uint64
} }
func (g *GetAttrIn) Flags() uint32 { func (g *GetAttrIn) Flags() uint32 {
return 0 return g.Flags_
} }
func (g *GetAttrIn) Fh() uint64 { func (g *GetAttrIn) Fh() uint64 {
return 0 return g.Fh_
} }
// Uses OpenIn struct for create. // Uses OpenIn struct for create.
type CreateIn struct { type CreateIn struct {
InHeader InHeader
Flags uint32 Flags uint32
Mode uint32
// Mode for the new file; already takes Umask into account.
Mode uint32
// Umask used for this create call.
Umask uint32
Padding uint32
} }
type MknodIn struct { type MknodIn struct {
InHeader InHeader
Mode uint32 // Mode to use, including the Umask value
Rdev uint32 Mode uint32
Rdev uint32
Umask uint32
Padding uint32
} }
type ReadIn struct { type ReadIn struct {
InHeader InHeader
Fh uint64 Fh uint64
Offset uint64 Offset uint64
Size uint32 Size uint32
ReadFlags uint32 ReadFlags uint32
LockOwner uint64
Flags uint32
Padding uint32
} }
type WriteIn struct { type WriteIn struct {
...@@ -107,6 +123,9 @@ type WriteIn struct { ...@@ -107,6 +123,9 @@ type WriteIn struct {
Offset uint64 Offset uint64
Size uint32 Size uint32
WriteFlags uint32 WriteFlags uint32
LockOwner uint64
Flags uint32
Padding uint32
} }
type SetXAttrIn struct { type SetXAttrIn struct {
......
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