gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Revert "avoid possible nil attributes"

Browse source 
This reverts commit 0a6703c7f7.
This commit is contained in:
chrislu 2022-04-06 10:01:45 -07:00
parent 368d8e1a81
commit 9d44b89c21
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
weed/mount/weedfs_attr.go
View file

@ -138,20 +138,18 @@ func (wfs *WFS) setAttrByPbEntry(out *fuse.Attr, inode uint64, entry *filer_pb.E
out.Size = filer.FileSize(entry) out.Size = filer.FileSize(entry)
out.Blocks = (out.Size + blockSize - 1) / blockSize out.Blocks = (out.Size + blockSize - 1) / blockSize
setBlksize(out, blockSize) setBlksize(out, blockSize)
if entry.Attributes != nil {
out.Mtime = uint64(entry.Attributes.Mtime) out.Mtime = uint64(entry.Attributes.Mtime)
out.Ctime = uint64(entry.Attributes.Mtime) out.Ctime = uint64(entry.Attributes.Mtime)
out.Atime = uint64(entry.Attributes.Mtime) out.Atime = uint64(entry.Attributes.Mtime)
out.Mode = toSyscallMode(os.FileMode(entry.Attributes.FileMode)) out.Mode = toSyscallMode(os.FileMode(entry.Attributes.FileMode))
out.Uid = entry.Attributes.Uid
out.Gid = entry.Attributes.Gid
out.Rdev = entry.Attributes.Rdev
}
if entry.HardLinkCounter > 0 { if entry.HardLinkCounter > 0 {
out.Nlink = uint32(entry.HardLinkCounter) out.Nlink = uint32(entry.HardLinkCounter)
} else { } else {
out.Nlink = 1 out.Nlink = 1
} }
out.Uid = entry.Attributes.Uid
out.Gid = entry.Attributes.Gid
out.Rdev = entry.Attributes.Rdev
} }
func (wfs *WFS) setAttrByFilerEntry(out *fuse.Attr, inode uint64, entry *filer.Entry) { func (wfs *WFS) setAttrByFilerEntry(out *fuse.Attr, inode uint64, entry *filer.Entry) {