Commit 9d6d672c authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys Committed by Han-Wen Nienhuys

Make file member public in LoopbackFile.

parent a29304bc
...@@ -62,7 +62,7 @@ func (me *DevNullFile) Fsync(*FsyncIn) (code Status) { ...@@ -62,7 +62,7 @@ func (me *DevNullFile) Fsync(*FsyncIn) (code Status) {
// LoopbackFile delegates all operations back to an underlying os.File. // LoopbackFile delegates all operations back to an underlying os.File.
type LoopbackFile struct { type LoopbackFile struct {
file *os.File File *os.File
DefaultFile DefaultFile
} }
...@@ -70,8 +70,8 @@ type LoopbackFile struct { ...@@ -70,8 +70,8 @@ type LoopbackFile struct {
func (me *LoopbackFile) Read(input *ReadIn, buffers BufferPool) ([]byte, Status) { func (me *LoopbackFile) Read(input *ReadIn, buffers BufferPool) ([]byte, Status) {
slice := buffers.AllocBuffer(input.Size) slice := buffers.AllocBuffer(input.Size)
n, err := me.file.ReadAt(slice, int64(input.Offset)) n, err := me.File.ReadAt(slice, int64(input.Offset))
// TODO - fix Go documentation. // TODO - fix Go ndocumentation.
if err == os.EOF { if err == os.EOF {
err = nil err = nil
} }
...@@ -79,35 +79,35 @@ func (me *LoopbackFile) Read(input *ReadIn, buffers BufferPool) ([]byte, Status) ...@@ -79,35 +79,35 @@ func (me *LoopbackFile) Read(input *ReadIn, buffers BufferPool) ([]byte, Status)
} }
func (me *LoopbackFile) Write(input *WriteIn, data []byte) (uint32, Status) { func (me *LoopbackFile) Write(input *WriteIn, data []byte) (uint32, Status) {
n, err := me.file.WriteAt(data, int64(input.Offset)) n, err := me.File.WriteAt(data, int64(input.Offset))
return uint32(n), OsErrorToErrno(err) return uint32(n), OsErrorToErrno(err)
} }
func (me *LoopbackFile) Release() { func (me *LoopbackFile) Release() {
me.file.Close() me.File.Close()
} }
func (me *LoopbackFile) Fsync(*FsyncIn) (code Status) { func (me *LoopbackFile) Fsync(*FsyncIn) (code Status) {
return Status(syscall.Fsync(me.file.Fd())) return Status(syscall.Fsync(me.File.Fd()))
} }
func (me *LoopbackFile) Truncate(size uint64) Status { func (me *LoopbackFile) Truncate(size uint64) Status {
return Status(syscall.Ftruncate(me.file.Fd(), int64(size))) return Status(syscall.Ftruncate(me.File.Fd(), int64(size)))
} }
// futimens missing from 6g runtime. // futimens missing from 6g runtime.
func (me *LoopbackFile) Chmod(mode uint32) Status { func (me *LoopbackFile) Chmod(mode uint32) Status {
return OsErrorToErrno(me.file.Chmod(mode)) return OsErrorToErrno(me.File.Chmod(mode))
} }
func (me *LoopbackFile) Chown(uid uint32, gid uint32) Status { func (me *LoopbackFile) Chown(uid uint32, gid uint32) Status {
return OsErrorToErrno(me.file.Chown(int(uid), int(gid))) return OsErrorToErrno(me.File.Chown(int(uid), int(gid)))
} }
func (me *LoopbackFile) GetAttr() (*os.FileInfo, Status) { func (me *LoopbackFile) GetAttr() (*os.FileInfo, Status) {
fi, err := me.file.Stat() fi, err := me.File.Stat()
if err != nil { if err != nil {
return nil, OsErrorToErrno(err) return nil, OsErrorToErrno(err)
} }
......
...@@ -79,7 +79,7 @@ func (me *LoopbackFileSystem) Open(name string, flags uint32) (fuseFile File, st ...@@ -79,7 +79,7 @@ func (me *LoopbackFileSystem) Open(name string, flags uint32) (fuseFile File, st
if err != nil { if err != nil {
return nil, OsErrorToErrno(err) return nil, OsErrorToErrno(err)
} }
return &LoopbackFile{file: f}, OK return &LoopbackFile{File: f}, OK
} }
func (me *LoopbackFileSystem) Chmod(path string, mode uint32) (code Status) { func (me *LoopbackFileSystem) Chmod(path string, mode uint32) (code Status) {
...@@ -140,7 +140,7 @@ func (me *LoopbackFileSystem) Access(name string, mode uint32) (code Status) { ...@@ -140,7 +140,7 @@ func (me *LoopbackFileSystem) Access(name string, mode uint32) (code Status) {
func (me *LoopbackFileSystem) Create(path string, flags uint32, mode uint32) (fuseFile File, code Status) { func (me *LoopbackFileSystem) Create(path string, flags uint32, mode uint32) (fuseFile File, code Status) {
f, err := os.OpenFile(me.GetPath(path), int(flags)|os.O_CREATE, mode) f, err := os.OpenFile(me.GetPath(path), int(flags)|os.O_CREATE, mode)
return &LoopbackFile{file: f}, OsErrorToErrno(err) return &LoopbackFile{File: f}, OsErrorToErrno(err)
} }
func (me *LoopbackFileSystem) GetXAttr(name string, attr string) ([]byte, Status) { func (me *LoopbackFileSystem) GetXAttr(name string, attr string) ([]byte, Status) {
......
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