Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
go-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
Levin Zimmermann
go-fuse
Commits
75f62dbe
Commit
75f62dbe
authored
13 years ago
by
Han-Wen Nienhuys
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Status.Ok()
parent
24671875
master
escapecomma
newapi-review
newapi-review2
t
x/bench
x/remmap-under-pagefault
y/nodefs-cancel
v20170619
v2.2.0
v2.1.0
v2.0.3
v2.0.2
v2.0.1
v2.0.0
v1.0.0
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
32 deletions
+32
-32
fuse/fuse.go
fuse/fuse.go
+1
-1
fuse/misc.go
fuse/misc.go
+1
-1
fuse/opcode.go
fuse/opcode.go
+2
-2
fuse/pathfilesystem.go
fuse/pathfilesystem.go
+3
-3
fuse/pathops.go
fuse/pathops.go
+8
-8
unionfs/cachingfs.go
unionfs/cachingfs.go
+1
-1
unionfs/unionfs.go
unionfs/unionfs.go
+16
-16
No files found.
fuse/fuse.go
View file @
75f62dbe
...
...
@@ -218,7 +218,7 @@ func (me *MountState) handleRequest(req *request) {
return
}
if
req
.
status
==
OK
{
if
req
.
status
.
Ok
()
{
req
.
handler
.
Func
(
me
,
req
)
}
...
...
This diff is collapsed.
Click to expand it.
fuse/misc.go
View file @
75f62dbe
...
...
@@ -16,7 +16,7 @@ import (
func
(
code
Status
)
String
()
string
{
if
code
==
OK
{
if
code
.
Ok
()
{
return
"OK"
}
return
fmt
.
Sprintf
(
"%d=%v"
,
int
(
code
),
os
.
Errno
(
code
))
...
...
This diff is collapsed.
Click to expand it.
fuse/opcode.go
View file @
75f62dbe
...
...
@@ -110,7 +110,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
])
req
.
status
=
status
if
status
==
OK
{
if
status
.
Ok
()
{
req
.
outData
=
unsafe
.
Pointer
(
&
CreateOut
{
EntryOut
:
*
entry
,
OpenOut
:
OpenOut
{
...
...
@@ -134,7 +134,7 @@ func doReadDir(state *MountState, req *request) {
func
doOpenDir
(
state
*
MountState
,
req
*
request
)
{
flags
,
handle
,
status
:=
state
.
fileSystem
.
OpenDir
(
req
.
inHeader
,
(
*
OpenIn
)(
req
.
inData
))
req
.
status
=
status
if
status
==
OK
{
if
status
.
Ok
()
{
req
.
outData
=
unsafe
.
Pointer
(
&
OpenOut
{
Fh
:
handle
,
OpenFlags
:
flags
,
...
...
This diff is collapsed.
Click to expand it.
fuse/pathfilesystem.go
View file @
75f62dbe
...
...
@@ -486,18 +486,18 @@ func (me *FileSystemConnector) Unmount(path string) Status {
// don't use defer: we don't want to call out to
// mount.fs.Unmount() with lock held.
if
unmountError
==
OK
&&
(
node
.
totalOpenCount
()
>
0
||
node
.
totalMountCount
()
>
1
)
{
if
unmountError
.
Ok
()
&&
(
node
.
totalOpenCount
()
>
0
||
node
.
totalMountCount
()
>
1
)
{
unmountError
=
EBUSY
}
if
unmountError
==
OK
{
if
unmountError
.
Ok
()
{
// We settle for eventual consistency.
mount
.
unmountPending
=
true
}
me
.
fileLock
.
Unlock
()
me
.
treeLock
.
RUnlock
()
if
unmountError
==
OK
{
if
unmountError
.
Ok
()
{
if
me
.
Debug
{
log
.
Println
(
"Unmount: "
,
mount
)
}
...
...
This diff is collapsed.
Click to expand it.
fuse/pathops.go
View file @
75f62dbe
...
...
@@ -172,7 +172,7 @@ func (me *FileSystemConnector) SetAttr(header *InHeader, input *SetAttrIn) (out
}
fileResult
:=
ENOSYS
if
err
==
OK
&&
input
.
Valid
&
FATTR_MODE
!=
0
{
if
err
.
Ok
()
&&
input
.
Valid
&
FATTR_MODE
!=
0
{
permissions
:=
uint32
(
07777
)
&
input
.
Mode
if
f
!=
nil
{
fileResult
=
f
.
Chmod
(
permissions
)
...
...
@@ -184,7 +184,7 @@ func (me *FileSystemConnector) SetAttr(header *InHeader, input *SetAttrIn) (out
fileResult
=
ENOSYS
}
}
if
err
==
OK
&&
(
input
.
Valid
&
(
FATTR_UID
|
FATTR_GID
)
!=
0
)
{
if
err
.
Ok
()
&&
(
input
.
Valid
&
(
FATTR_UID
|
FATTR_GID
)
!=
0
)
{
if
f
!=
nil
{
fileResult
=
f
.
Chown
(
uint32
(
input
.
Uid
),
uint32
(
input
.
Gid
))
}
...
...
@@ -197,7 +197,7 @@ func (me *FileSystemConnector) SetAttr(header *InHeader, input *SetAttrIn) (out
fileResult
=
ENOSYS
}
}
if
err
==
OK
&&
input
.
Valid
&
FATTR_SIZE
!=
0
{
if
err
.
Ok
()
&&
input
.
Valid
&
FATTR_SIZE
!=
0
{
if
f
!=
nil
{
fileResult
=
f
.
Truncate
(
input
.
Size
)
}
...
...
@@ -208,7 +208,7 @@ func (me *FileSystemConnector) SetAttr(header *InHeader, input *SetAttrIn) (out
fileResult
=
ENOSYS
}
}
if
err
==
OK
&&
(
input
.
Valid
&
(
FATTR_ATIME
|
FATTR_MTIME
|
FATTR_ATIME_NOW
|
FATTR_MTIME_NOW
)
!=
0
)
{
if
err
.
Ok
()
&&
(
input
.
Valid
&
(
FATTR_ATIME
|
FATTR_MTIME
|
FATTR_ATIME_NOW
|
FATTR_MTIME_NOW
)
!=
0
)
{
atime
:=
uint64
(
input
.
Atime
*
1e9
)
+
uint64
(
input
.
Atimensec
)
if
input
.
Valid
&
FATTR_ATIME_NOW
!=
0
{
atime
=
uint64
(
time
.
Nanoseconds
())
...
...
@@ -264,7 +264,7 @@ func (me *FileSystemConnector) Mkdir(header *InHeader, input *MkdirIn, name stri
return
nil
,
ENOENT
}
code
=
mount
.
fs
.
Mkdir
(
filepath
.
Join
(
fullPath
,
name
),
input
.
Mode
)
if
code
==
OK
{
if
code
.
Ok
()
{
out
,
code
=
me
.
internalLookup
(
parent
,
name
,
1
)
}
return
out
,
code
...
...
@@ -276,7 +276,7 @@ func (me *FileSystemConnector) Unlink(header *InHeader, name string) (code Statu
return
ENOENT
}
code
=
mount
.
fs
.
Unlink
(
filepath
.
Join
(
fullPath
,
name
))
if
code
==
OK
{
if
code
.
Ok
()
{
// Like fuse.c, we update our internal tables.
me
.
unlinkUpdate
(
parent
,
name
)
}
...
...
@@ -289,7 +289,7 @@ func (me *FileSystemConnector) Rmdir(header *InHeader, name string) (code Status
return
ENOENT
}
code
=
mount
.
fs
.
Rmdir
(
filepath
.
Join
(
fullPath
,
name
))
if
code
==
OK
{
if
code
.
Ok
()
{
me
.
unlinkUpdate
(
parent
,
name
)
}
return
code
...
...
@@ -322,7 +322,7 @@ func (me *FileSystemConnector) Rename(header *InHeader, input *RenameIn, oldName
oldPath
=
filepath
.
Join
(
oldPath
,
oldName
)
newPath
=
filepath
.
Join
(
newPath
,
newName
)
code
=
mount
.
fs
.
Rename
(
oldPath
,
newPath
)
if
code
==
OK
{
if
code
.
Ok
()
{
me
.
renameUpdate
(
oldParent
,
oldName
,
newParent
,
newName
)
}
return
code
...
...
This diff is collapsed.
Click to expand it.
unionfs/cachingfs.go
View file @
75f62dbe
...
...
@@ -86,7 +86,7 @@ func (me *CachingFileSystem) Readlink(name string) (string, fuse.Status) {
func
(
me
*
CachingFileSystem
)
OpenDir
(
name
string
)
(
stream
chan
fuse
.
DirEntry
,
status
fuse
.
Status
)
{
r
:=
me
.
dirs
.
Get
(
name
)
.
(
*
dirResponse
)
if
r
.
Status
==
fuse
.
OK
{
if
r
.
Status
.
Ok
()
{
stream
=
make
(
chan
fuse
.
DirEntry
,
len
(
r
.
entries
))
for
_
,
d
:=
range
r
.
entries
{
stream
<-
d
...
...
This diff is collapsed.
Click to expand it.
unionfs/unionfs.go
View file @
75f62dbe
...
...
@@ -157,7 +157,7 @@ func (me *UnionFs) getBranchAttrNoCache(name string) branchResult {
}
a
,
s
:=
fs
.
GetAttr
(
name
)
if
s
==
fuse
.
OK
{
if
s
.
Ok
()
{
if
a
.
Mode
&
fuse
.
S_IFDIR
!=
0
{
// Make all directories appear writable
a
.
Mode
|=
0200
...
...
@@ -282,7 +282,7 @@ func (me *UnionFs) Rmdir(path string) (code fuse.Status) {
}
if
r
.
branch
>
0
{
stream
,
code
:=
me
.
fileSystems
[
r
.
branch
]
.
OpenDir
(
path
)
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
_
,
ok
:=
<-
stream
if
ok
{
// TODO - should consume stream.
...
...
@@ -312,10 +312,10 @@ func (me *UnionFs) Mkdir(path string, mode uint32) (code fuse.Status) {
}
code
=
me
.
promoteDirsTo
(
path
)
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
code
=
me
.
fileSystems
[
0
]
.
Mkdir
(
path
,
mode
)
}
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
me
.
removeDeletion
(
path
)
attr
:=
&
fuse
.
Attr
{
Mode
:
fuse
.
S_IFDIR
|
mode
,
...
...
@@ -327,7 +327,7 @@ func (me *UnionFs) Mkdir(path string, mode uint32) (code fuse.Status) {
func
(
me
*
UnionFs
)
Symlink
(
pointedTo
string
,
linkName
string
)
(
code
fuse
.
Status
)
{
code
=
me
.
fileSystems
[
0
]
.
Symlink
(
pointedTo
,
linkName
)
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
me
.
removeDeletion
(
linkName
)
me
.
branchCache
.
Set
(
linkName
,
branchResult
{
nil
,
fuse
.
OK
,
0
})
}
...
...
@@ -351,14 +351,14 @@ func (me *UnionFs) Utimens(name string, atime uint64, ctime uint64) (code fuse.S
r
:=
me
.
getBranch
(
name
)
code
=
r
.
code
if
code
==
fuse
.
OK
&&
r
.
branch
>
0
{
if
code
.
Ok
()
&&
r
.
branch
>
0
{
code
=
me
.
Promote
(
name
,
r
)
r
.
branch
=
0
}
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
code
=
me
.
fileSystems
[
0
]
.
Utimens
(
name
,
atime
,
ctime
)
}
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
r
.
attr
.
Atime
=
uint64
(
atime
/
1e9
)
r
.
attr
.
Atimensec
=
uint32
(
atime
%
1e9
)
r
.
attr
.
Ctime
=
uint64
(
ctime
/
1e9
)
...
...
@@ -462,7 +462,7 @@ func (me *UnionFs) Readlink(name string) (out string, code fuse.Status) {
func
IsDir
(
fs
fuse
.
FileSystem
,
name
string
)
bool
{
a
,
code
:=
fs
.
GetAttr
(
name
)
return
code
==
fuse
.
OK
&&
a
.
Mode
&
fuse
.
S_IFDIR
!=
0
return
code
.
Ok
()
&&
a
.
Mode
&
fuse
.
S_IFDIR
!=
0
}
func
stripSlash
(
fn
string
)
string
{
...
...
@@ -518,7 +518,7 @@ func (me *UnionFs) Create(name string, flags uint32, mode uint32) (fuseFile fuse
return
nil
,
code
}
fuseFile
,
code
=
writable
.
Create
(
name
,
flags
,
mode
)
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
me
.
removeDeletion
(
name
)
a
:=
fuse
.
Attr
{
...
...
@@ -591,7 +591,7 @@ func (me *UnionFs) OpenDir(directory string) (stream chan fuse.DirEntry, status
go
func
(
j
int
,
pfs
fuse
.
FileSystem
)
{
ch
,
s
:=
pfs
.
OpenDir
(
directory
)
statuses
[
j
]
=
s
for
s
==
fuse
.
OK
{
for
s
.
Ok
()
{
v
:=
<-
ch
if
v
.
Name
==
""
{
break
...
...
@@ -653,20 +653,20 @@ func (me *UnionFs) OpenDir(directory string) (stream chan fuse.DirEntry, status
func
(
me
*
UnionFs
)
Rename
(
src
string
,
dst
string
)
(
code
fuse
.
Status
)
{
srcResult
:=
me
.
getBranch
(
src
)
code
=
srcResult
.
code
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
code
=
srcResult
.
code
}
if
code
==
fuse
.
OK
&&
srcResult
.
branch
>
0
{
if
code
.
Ok
()
&&
srcResult
.
branch
>
0
{
code
=
me
.
Promote
(
src
,
srcResult
)
}
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
code
=
me
.
promoteDirsTo
(
dst
)
}
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
code
=
me
.
fileSystems
[
0
]
.
Rename
(
src
,
dst
)
}
if
code
==
fuse
.
OK
{
if
code
.
Ok
()
{
me
.
removeDeletion
(
dst
)
srcResult
.
branch
=
0
me
.
branchCache
.
Set
(
dst
,
srcResult
)
...
...
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