diff options
Diffstat (limited to 'weed/filer')
| -rw-r--r-- | weed/filer/entry.go | 2 | ||||
| -rw-r--r-- | weed/filer/entry_codec.go | 4 | ||||
| -rw-r--r-- | weed/filer/filer_conf.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/weed/filer/entry.go b/weed/filer/entry.go index e579b9b21..987ea8cca 100644 --- a/weed/filer/entry.go +++ b/weed/filer/entry.go @@ -18,7 +18,7 @@ type Attr struct { Replication string // replication Collection string // collection name TtlSec int32 // ttl in seconds - VolumeType string + DiskType string UserName string GroupNames []string SymlinkTarget string diff --git a/weed/filer/entry_codec.go b/weed/filer/entry_codec.go index 45b391436..cc7353974 100644 --- a/weed/filer/entry_codec.go +++ b/weed/filer/entry_codec.go @@ -56,7 +56,7 @@ func EntryAttributeToPb(entry *Entry) *filer_pb.FuseAttributes { Collection: entry.Attr.Collection, Replication: entry.Attr.Replication, TtlSec: entry.Attr.TtlSec, - VolumeType: entry.Attr.VolumeType, + DiskType: entry.Attr.DiskType, UserName: entry.Attr.UserName, GroupName: entry.Attr.GroupNames, SymlinkTarget: entry.Attr.SymlinkTarget, @@ -82,7 +82,7 @@ func PbToEntryAttribute(attr *filer_pb.FuseAttributes) Attr { t.Collection = attr.Collection t.Replication = attr.Replication t.TtlSec = attr.TtlSec - t.VolumeType = attr.VolumeType + t.DiskType = attr.DiskType t.UserName = attr.UserName t.GroupNames = attr.GroupName t.SymlinkTarget = attr.SymlinkTarget diff --git a/weed/filer/filer_conf.go b/weed/filer/filer_conf.go index 18ed37abd..b4f0e5890 100644 --- a/weed/filer/filer_conf.go +++ b/weed/filer/filer_conf.go @@ -116,7 +116,7 @@ func mergePathConf(a, b *filer_pb.FilerConf_PathConf) { a.Collection = util.Nvl(b.Collection, a.Collection) a.Replication = util.Nvl(b.Replication, a.Replication) a.Ttl = util.Nvl(b.Ttl, a.Ttl) - if b.DiskType != filer_pb.FilerConf_PathConf_NONE { + if b.DiskType != "" { a.DiskType = b.DiskType } a.Fsync = b.Fsync || a.Fsync |