Fixed build errors.

Caused by jacobsa/bazilfuse@47700022b9.
geesefs-0-30-9
Aaron Jacobs 2015-06-05 15:24:22 +10:00
parent 8a8429af13
commit 32fbc7f9e7
2 changed files with 8 additions and 7 deletions

View File

@ -253,7 +253,10 @@ func Convert(
return
}
func convertAttributes(inode InodeID, attr InodeAttributes) bazilfuse.Attr {
func convertAttributes(
inode InodeID,
attr InodeAttributes,
expiration time.Time) bazilfuse.Attr {
return bazilfuse.Attr{
Inode: uint64(inode),
Size: attr.Size,
@ -265,6 +268,7 @@ func convertAttributes(inode InodeID, attr InodeAttributes) bazilfuse.Attr {
Crtime: attr.Crtime,
Uid: attr.Uid,
Gid: attr.Gid,
Valid: convertExpirationTime(expiration),
}
}
@ -292,7 +296,6 @@ func convertChildInodeEntry(
out *bazilfuse.LookupResponse) {
out.Node = bazilfuse.NodeID(in.Child)
out.Generation = uint64(in.Generation)
out.Attr = convertAttributes(in.Child, in.Attributes)
out.AttrValid = convertExpirationTime(in.AttributesExpiration)
out.Attr = convertAttributes(in.Child, in.Attributes, in.AttributesExpiration)
out.EntryValid = convertExpirationTime(in.EntryExpiration)
}

View File

@ -174,8 +174,7 @@ type GetInodeAttributesOp struct {
func (o *GetInodeAttributesOp) toBazilfuseResponse() (bfResp interface{}) {
resp := bazilfuse.GetattrResponse{
Attr: convertAttributes(o.Inode, o.Attributes),
AttrValid: convertExpirationTime(o.AttributesExpiration),
Attr: convertAttributes(o.Inode, o.Attributes, o.AttributesExpiration),
}
bfResp = &resp
@ -207,8 +206,7 @@ type SetInodeAttributesOp struct {
func (o *SetInodeAttributesOp) toBazilfuseResponse() (bfResp interface{}) {
resp := bazilfuse.SetattrResponse{
Attr: convertAttributes(o.Inode, o.Attributes),
AttrValid: convertExpirationTime(o.AttributesExpiration),
Attr: convertAttributes(o.Inode, o.Attributes, o.AttributesExpiration),
}
bfResp = &resp