fs: cleanup - do not cache size of metafiles (#3630)

* Remove Size() method and size field from lock.LockedFile
* WriteTo method of fsMeta and uploadsV1 now takes concrete type *lock.LockedFile
This commit is contained in:
Krishna Srinivas
2017-01-25 12:29:06 -08:00
committed by Harshavardhana
parent 76b8abcd8e
commit 82373e3d50
10 changed files with 32 additions and 36 deletions

View File

@@ -89,14 +89,7 @@ func RLockedOpenFile(path string) (*RLockedFile, error) {
}
// LockedFile represents a locked file, implements a helper
// method Size(), represents the size of the underlying object.
// LockedFile represents a locked file
type LockedFile struct {
*os.File
size int64
}
// Size - size of the underlying locked file.
func (l *LockedFile) Size() int64 {
return l.size
}

View File

@@ -71,5 +71,5 @@ func LockedOpenFile(path string, flag int, perm os.FileMode) (*LockedFile, error
}
}
return &LockedFile{File: f, size: st.Size()}, nil
return &LockedFile{File: f}, nil
}

View File

@@ -80,9 +80,6 @@ func TestRWLockedFile(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if rlk.Size() != 0 {
t.Fatal("File size should be zero", rlk.Size())
}
isClosed := rlk.IsClosed()
if isClosed {
t.Fatal("File ref count shouldn't be zero")

View File

@@ -65,7 +65,7 @@ func LockedOpenFile(path string, flag int, perm os.FileMode) (*LockedFile, error
}
}
return &LockedFile{File: f, size: st.Size()}, nil
return &LockedFile{File: f}, nil
}
func makeInheritSa() *syscall.SecurityAttributes {