lib9p

commit f6b24e721004e3fa235451604e701c3eb86c5db6
parent 9ead9332ed49f0cf63b76750c13fbe9574174921
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Wed, 13 Sep 2023 11:42:44 +0900

delete unused items

Diffstat:
M
diskfs/file.go
 | 
41
++++-------------------------------------

1 file changed, 4 insertions(+), 37 deletions(-)
diff --git a/diskfs/file.go b/diskfs/file.go
@@ -15,9 +15,6 @@ type File struct {
 	fs         *FS      // file system to which this file belongs
 	file       *os.File // underlying file
 	path       string   // absolute path from the root of the fs.
-	mode       lib9p.OpenMode
-	childEntry []*lib9p.DirEntry
-	diroff     int // directory offset for ReadDir()
 }
 
 func getChildEntry(fsys *FS, dir *os.File) ([]*lib9p.DirEntry, error) {
@@ -63,13 +60,8 @@ func openFile(fsys *FS, fpath string, mode lib9p.OpenMode) (*File, error) {
 	}
 
 	var file *os.File
-	var childEntry []*lib9p.DirEntry
 	if fsfi.IsDir() {
 		file = fsfile.(*os.File)
-		childEntry, err = getChildEntry(fsys, file)
-		if err != nil {
-			return nil, err
-		}
 	} else {
 		var osmode int
 		switch mode {
@@ -89,9 +81,7 @@ func openFile(fsys *FS, fpath string, mode lib9p.OpenMode) (*File, error) {
 	f := &File{
 		fs:         fsys,
 		file:       file,
-		mode:       mode,
 		path:       fpath,
-		childEntry: childEntry,
 	}
 	return f, nil
 }
@@ -165,14 +155,14 @@ func (f *File) Child() ([]lib9p.File, error) {
 		return nil, err
 	}
 	f.file = dir.(*os.File)
-	f.childEntry, err = getChildEntry(f.fs, f.file)
+	childEntry, err := getChildEntry(f.fs, f.file)
 	if err != nil {
 		return nil, err
 	}
 
-	files := make([]lib9p.File, len(f.childEntry))
-	for i := 0; i < len(f.childEntry); i++ {
-		cpath := path.Join(f.path, f.childEntry[i].Name())
+	files := make([]lib9p.File, len(childEntry))
+	for i := 0; i < len(childEntry); i++ {
+		cpath := path.Join(f.path, childEntry[i].Name())
 		child, err := f.fs.Open(cpath)
 		if err != nil {
 			return files, fmt.Errorf("open child unko: %v", err)
@@ -191,16 +181,6 @@ func (f *File) WriteAt(p []byte, off int64) (int, error) {
 	return n, err
 }
 
-func (f *File) ReadDir(n int) ([]*lib9p.DirEntry, error) {
-	childEntry := f.childEntry[f.diroff:]
-	if n < 0 || len(childEntry) < n {
-		n = len(childEntry)
-	}
-
-	f.diroff += n
-	return childEntry[:n], nil
-}
-
 func (f *File) Create(name string, uid string,
 	mode lib9p.OpenMode, perm lib9p.FileMode) (lib9p.File, error) {
 	dirinfo, err := f.Stat()
@@ -241,19 +221,6 @@ func (f *File) Create(name string, uid string,
 		return nil, fmt.Errorf("set file mode: %v", err)
 	}
 
-	osstat, err := osfile.Stat()
-	if err != nil {
-		return nil, fmt.Errorf("stat: %v", err)
-	}
-	// TODO: unix specific.
-	sys := osstat.Sys().(*syscall.Stat_t)
-	id := fileID{
-		device: sys.Dev,
-		inode:  sys.Ino,
-	}
-	stat := fiStat(f.fs.qidPool, id, osstat)
-	f.childEntry = append(f.childEntry, &lib9p.DirEntry{Stat: *stat})
-
 	if err := osfile.Close(); err != nil {
 		return nil, fmt.Errorf("close: %v", err)
 	}