Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jacobsa-fuse
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
jacobsa-fuse
Commits
b14b41f3
Commit
b14b41f3
authored
Jul 23, 2015
by
Aaron Jacobs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed more build errors.
parent
bd41a4e7
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
96 additions
and
119 deletions
+96
-119
internal/fusekernel/fuse_kernel.go
internal/fusekernel/fuse_kernel.go
+42
-42
internal/fusekernel/fuse_kernel_darwin.go
internal/fusekernel/fuse_kernel_darwin.go
+6
-14
internal/fuseshim/fuse.go
internal/fuseshim/fuse.go
+48
-63
No files found.
internal/fusekernel/fuse_kernel.go
View file @
b14b41f3
...
...
@@ -397,7 +397,7 @@ type entryOut struct {
Attr
Attr
}
func
e
ntryOutSize
(
p
Protocol
)
uintptr
{
func
E
ntryOutSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
9
})
:
return
unsafe
.
Offsetof
(
entryOut
{}
.
Attr
)
+
unsafe
.
Offsetof
(
entryOut
{}
.
Attr
.
Blksize
)
...
...
@@ -406,11 +406,11 @@ func entryOutSize(p Protocol) uintptr {
}
}
type
f
orgetIn
struct
{
type
F
orgetIn
struct
{
Nlookup
uint64
}
type
g
etattrIn
struct
{
type
G
etattrIn
struct
{
GetattrFlags
uint32
dummy
uint32
Fh
uint64
...
...
@@ -423,7 +423,7 @@ type attrOut struct {
Attr
Attr
}
func
a
ttrOutSize
(
p
Protocol
)
uintptr
{
func
A
ttrOutSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
9
})
:
return
unsafe
.
Offsetof
(
attrOut
{}
.
Attr
)
+
unsafe
.
Offsetof
(
attrOut
{}
.
Attr
.
Blksize
)
...
...
@@ -440,7 +440,7 @@ type getxtimesOut struct {
CrtimeNsec
uint32
}
type
m
knodIn
struct
{
type
M
knodIn
struct
{
Mode
uint32
Rdev
uint32
Umask
uint32
...
...
@@ -448,43 +448,43 @@ type mknodIn struct {
// "filename\x00" follows.
}
func
m
knodInSize
(
p
Protocol
)
uintptr
{
func
M
knodInSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
12
})
:
return
unsafe
.
Offsetof
(
m
knodIn
{}
.
Umask
)
return
unsafe
.
Offsetof
(
M
knodIn
{}
.
Umask
)
default
:
return
unsafe
.
Sizeof
(
m
knodIn
{})
return
unsafe
.
Sizeof
(
M
knodIn
{})
}
}
type
m
kdirIn
struct
{
type
M
kdirIn
struct
{
Mode
uint32
Umask
uint32
// filename follows
}
func
m
kdirInSize
(
p
Protocol
)
uintptr
{
func
M
kdirInSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
12
})
:
return
unsafe
.
Offsetof
(
m
kdirIn
{}
.
Umask
)
+
4
return
unsafe
.
Offsetof
(
M
kdirIn
{}
.
Umask
)
+
4
default
:
return
unsafe
.
Sizeof
(
m
kdirIn
{})
return
unsafe
.
Sizeof
(
M
kdirIn
{})
}
}
type
r
enameIn
struct
{
type
R
enameIn
struct
{
Newdir
uint64
// "oldname\x00newname\x00" follows
}
// OS X
type
e
xchangeIn
struct
{
type
E
xchangeIn
struct
{
Olddir
uint64
Newdir
uint64
Options
uint64
}
type
l
inkIn
struct
{
type
L
inkIn
struct
{
Oldnodeid
uint64
}
...
...
@@ -507,7 +507,7 @@ type setattrInCommon struct {
Unused5
uint32
}
type
o
penIn
struct
{
type
O
penIn
struct
{
Flags
uint32
Unused
uint32
}
...
...
@@ -518,37 +518,37 @@ type openOut struct {
Padding
uint32
}
type
c
reateIn
struct
{
type
C
reateIn
struct
{
Flags
uint32
Mode
uint32
Umask
uint32
padding
uint32
}
func
c
reateInSize
(
p
Protocol
)
uintptr
{
func
C
reateInSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
12
})
:
return
unsafe
.
Offsetof
(
c
reateIn
{}
.
Umask
)
return
unsafe
.
Offsetof
(
C
reateIn
{}
.
Umask
)
default
:
return
unsafe
.
Sizeof
(
c
reateIn
{})
return
unsafe
.
Sizeof
(
C
reateIn
{})
}
}
type
r
eleaseIn
struct
{
type
R
eleaseIn
struct
{
Fh
uint64
Flags
uint32
ReleaseFlags
uint32
LockOwner
uint32
}
type
f
lushIn
struct
{
type
F
lushIn
struct
{
Fh
uint64
FlushFlags
uint32
Padding
uint32
LockOwner
uint64
}
type
r
eadIn
struct
{
type
R
eadIn
struct
{
Fh
uint64
Offset
uint64
Size
uint32
...
...
@@ -558,12 +558,12 @@ type readIn struct {
padding
uint32
}
func
r
eadInSize
(
p
Protocol
)
uintptr
{
func
R
eadInSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
9
})
:
return
unsafe
.
Offsetof
(
r
eadIn
{}
.
ReadFlags
)
+
4
return
unsafe
.
Offsetof
(
R
eadIn
{}
.
ReadFlags
)
+
4
default
:
return
unsafe
.
Sizeof
(
r
eadIn
{})
return
unsafe
.
Sizeof
(
R
eadIn
{})
}
}
...
...
@@ -583,7 +583,7 @@ func (fl ReadFlags) String() string {
return
flagString
(
uint32
(
fl
),
readFlagNames
)
}
type
w
riteIn
struct
{
type
W
riteIn
struct
{
Fh
uint64
Offset
uint64
Size
uint32
...
...
@@ -593,12 +593,12 @@ type writeIn struct {
padding
uint32
}
func
w
riteInSize
(
p
Protocol
)
uintptr
{
func
W
riteInSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
9
})
:
return
unsafe
.
Offsetof
(
w
riteIn
{}
.
LockOwner
)
return
unsafe
.
Offsetof
(
W
riteIn
{}
.
LockOwner
)
default
:
return
unsafe
.
Sizeof
(
w
riteIn
{})
return
unsafe
.
Sizeof
(
W
riteIn
{})
}
}
...
...
@@ -631,7 +631,7 @@ type statfsOut struct {
St
kstatfs
}
type
f
syncIn
struct
{
type
F
syncIn
struct
{
Fh
uint64
FsyncFlags
uint32
Padding
uint32
...
...
@@ -660,7 +660,7 @@ type getxattrOut struct {
Padding
uint32
}
type
l
kIn
struct
{
type
L
kIn
struct
{
Fh
uint64
Owner
uint64
Lk
fileLock
...
...
@@ -668,12 +668,12 @@ type lkIn struct {
padding
uint32
}
func
l
kInSize
(
p
Protocol
)
uintptr
{
func
L
kInSize
(
p
Protocol
)
uintptr
{
switch
{
case
p
.
LT
(
Protocol
{
7
,
9
})
:
return
unsafe
.
Offsetof
(
l
kIn
{}
.
LkFlags
)
return
unsafe
.
Offsetof
(
L
kIn
{}
.
LkFlags
)
default
:
return
unsafe
.
Sizeof
(
l
kIn
{})
return
unsafe
.
Sizeof
(
L
kIn
{})
}
}
...
...
@@ -681,19 +681,19 @@ type lkOut struct {
Lk
fileLock
}
type
a
ccessIn
struct
{
type
A
ccessIn
struct
{
Mask
uint32
Padding
uint32
}
type
i
nitIn
struct
{
type
I
nitIn
struct
{
Major
uint32
Minor
uint32
MaxReadahead
uint32
Flags
uint32
}
const
InitInSize
=
int
(
unsafe
.
Sizeof
(
i
nitIn
{}))
const
InitInSize
=
int
(
unsafe
.
Sizeof
(
I
nitIn
{}))
type
initOut
struct
{
Major
uint32
...
...
@@ -704,11 +704,11 @@ type initOut struct {
MaxWrite
uint32
}
type
i
nterruptIn
struct
{
type
I
nterruptIn
struct
{
Unique
uint64
}
type
b
mapIn
struct
{
type
B
mapIn
struct
{
Block
uint64
BlockSize
uint32
Padding
uint32
...
...
@@ -753,13 +753,13 @@ const (
notifyCodeInvalEntry
int32
=
3
)
type
n
otifyInvalInodeOut
struct
{
type
N
otifyInvalInodeOut
struct
{
Ino
uint64
Off
int64
Len
int64
}
type
n
otifyInvalEntryOut
struct
{
type
N
otifyInvalEntryOut
struct
{
Parent
uint64
Namelen
uint32
padding
uint32
...
...
internal/fusekernel/fuse_kernel_darwin.go
View file @
b14b41f3
...
...
@@ -34,7 +34,7 @@ func (a *Attr) SetFlags(f uint32) {
a
.
Flags_
=
f
}
type
s
etattrIn
struct
{
type
S
etattrIn
struct
{
setattrInCommon
// OS X only
...
...
@@ -47,15 +47,15 @@ type setattrIn struct {
Flags_
uint32
// see chflags(2)
}
func
(
in
*
s
etattrIn
)
BkupTime
()
time
.
Time
{
func
(
in
*
S
etattrIn
)
BkupTime
()
time
.
Time
{
return
time
.
Unix
(
int64
(
in
.
Bkuptime_
),
int64
(
in
.
BkuptimeNsec
))
}
func
(
in
*
s
etattrIn
)
Chgtime
()
time
.
Time
{
func
(
in
*
S
etattrIn
)
Chgtime
()
time
.
Time
{
return
time
.
Unix
(
int64
(
in
.
Chgtime_
),
int64
(
in
.
ChgtimeNsec
))
}
func
(
in
*
s
etattrIn
)
Flags
()
uint32
{
func
(
in
*
S
etattrIn
)
Flags
()
uint32
{
return
in
.
Flags_
}
...
...
@@ -63,7 +63,7 @@ func openFlags(flags uint32) OpenFlags {
return
OpenFlags
(
flags
)
}
type
g
etxattrIn
struct
{
type
G
etxattrIn
struct
{
getxattrInCommon
// OS X only
...
...
@@ -71,18 +71,10 @@ type getxattrIn struct {
Padding
uint32
}
func
(
g
*
getxattrIn
)
position
()
uint32
{
return
g
.
Position
}
type
setxattrIn
struct
{
type
SetxattrIn
struct
{
setxattrInCommon
// OS X only
Position
uint32
Padding
uint32
}
func
(
s
*
setxattrIn
)
position
()
uint32
{
return
s
.
Position
}
internal/fuseshim/fuse.go
View file @
b14b41f3
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment