yannickulrich
/
itd
forked from Elara6331/itd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Used new error conversion routine

This commit is contained in:
Yannick Ulrich 2023-03-04 09:19:27 +00:00
parent 4c59561a99
commit b28c386c4e
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/fusefs/fuse.go
View File

@ -126,8 +126,7 @@ func (n *ITNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
files, err := myfs.ReadDir(n.path) files, err := myfs.ReadDir(n.path)
if err != nil { if err != nil {
log.Error("FUSE ReadDir failed").Str("path", n.path).Err(err).Send() log.Error("FUSE ReadDir failed").Str("path", n.path).Err(err).Send()
// TODO we probably should figure out why it failed return nil, syscallErr(err)
return nil, syscall.ENOENT
} }
log.Debug("FUSE ReadDir succeeded").Str("path", n.path).Int("objects", len(files)).Send() log.Debug("FUSE ReadDir succeeded").Str("path", n.path).Int("objects", len(files)).Send()
@ -137,7 +136,7 @@ func (n *ITNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
info, err := entry.Info() info, err := entry.Info()
if err != nil { if err != nil {
log.Error("FUSE Info failed").Str("path", n.path).Err(err).Send() log.Error("FUSE Info failed").Str("path", n.path).Err(err).Send()
return nil, syscall.ENOENT return nil, syscallErr(err)
} }
name := info.Name() name := info.Name()
@ -307,7 +306,7 @@ func (fh *bytesFileWriteHandle) Flush(ctx context.Context) (errno syscall.Errno)
fp, err := myfs.Create(fh.path, uint32(len(fh.content))) fp, err := myfs.Create(fh.path, uint32(len(fh.content)))
if err != nil { if err != nil {
log.Error("FUSE Flush failed: create").Str("path", fh.path).Err(err).Send() log.Error("FUSE Flush failed: create").Str("path", fh.path).Err(err).Send()
return syscall.EROFS return syscallErr(err)
} }
go func() { go func() {
@ -322,7 +321,7 @@ func (fh *bytesFileWriteHandle) Flush(ctx context.Context) (errno syscall.Errno)
if err != nil { if err != nil {
log.Error("FUSE Flush failed during write").Str("path", fh.path).Err(err).Send() log.Error("FUSE Flush failed during write").Str("path", fh.path).Err(err).Send()
fp.Close() fp.Close()
return syscall.EIO return syscallErr(err)
} }
if int(nread) != len(fh.content) { if int(nread) != len(fh.content) {
log.Error("FUSE Flush failed during write").Str("path", fh.path).Int("expect", len(fh.content)).Int("got", int(nread)).Send() log.Error("FUSE Flush failed during write").Str("path", fh.path).Int("expect", len(fh.content)).Int("got", int(nread)).Send()
@ -332,7 +331,7 @@ func (fh *bytesFileWriteHandle) Flush(ctx context.Context) (errno syscall.Errno)
err = fp.Close() err = fp.Close()
if err != nil { if err != nil {
log.Error("FUSE Flush failed during close").Str("path", fh.path).Err(err).Send() log.Error("FUSE Flush failed during close").Str("path", fh.path).Err(err).Send()
return syscall.EIO return syscallErr(err)
} }
log.Debug("FUSE Flush done").Str("path", fh.path).Int("size", len(fh.content)).Send() log.Debug("FUSE Flush done").Str("path", fh.path).Int("size", len(fh.content)).Send()
@ -383,9 +382,8 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
log.Debug("FUSE Opening for read").Str("path", f.path).Send() log.Debug("FUSE Opening for read").Str("path", f.path).Send()
fp, err := myfs.Open(f.path) fp, err := myfs.Open(f.path)
if err != nil { if err != nil {
// TODO we probably should figure out why it failed
log.Error("FUSE: Opening failed").Str("path", f.path).Err(err).Send() log.Error("FUSE: Opening failed").Str("path", f.path).Err(err).Send()
return nil, 0, syscall.EROFS return nil, 0, syscallErr(err)
} }
defer fp.Close() defer fp.Close()
@ -403,7 +401,7 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
if err != nil { if err != nil {
log.Error("FUSE Read failed").Str("path", f.path).Err(err).Send() log.Error("FUSE Read failed").Str("path", f.path).Err(err).Send()
fp.Close() fp.Close()
return nil, 0, syscall.EIO return nil, 0, syscallErr(err)
} }
fh = &bytesFileReadHandle{ fh = &bytesFileReadHandle{
@ -425,8 +423,7 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
sub_ctx, cancel := context.WithCancel(ctx) sub_ctx, cancel := context.WithCancel(ctx)
ans, err := value.gen(sub_ctx) ans, err := value.gen(sub_ctx)
if err != nil { if err != nil {
// TODO we probably should figure out why it failed return nil, 0, syscallErr(err)
return nil, 0, syscall.EIO
} }
fh = &sensorFileReadHandle{ fh = &sensorFileReadHandle{
@ -484,8 +481,7 @@ func (f *ITNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.
Str("path", path). Str("path", path).
Err(err). Err(err).
Send() Send()
// TODO we probably should figure out why it failed return nil, syscallErr(err)
return nil, syscall.EROFS
} }
ino := uint64(len(inodemap)) + 11 ino := uint64(len(inodemap)) + 11
@ -525,8 +521,7 @@ func (f *ITNode) Rename(ctx context.Context, name string, newParent fs.InodeEmbe
Err(err). Err(err).
Send() Send()
// TODO we probably should figure out why it failed return syscallErr(err)
return syscall.EIO
} }
log.Debug("FUSE Rename sucess"). log.Debug("FUSE Rename sucess").
Str("src", p1). Str("src", p1).
@ -554,8 +549,7 @@ func (f *ITNode) Unlink(ctx context.Context, name string) syscall.Errno {
Err(err). Err(err).
Send() Send()
// TODO we probably should figure out why it failed return syscallErr(err)
return syscall.EIO
} }
log.Debug("FUSE Unlink success"). log.Debug("FUSE Unlink success").