6 files changed, 11 insertions, 9 deletions
diff --git a/weed/filer/abstract_sql/abstract_sql_store_kv.go b/weed/filer/abstract_sql/abstract_sql_store_kv.go
index 81d105134..792a45ff4 100644
--- a/weed/filer/abstract_sql/abstract_sql_store_kv.go
+++ b/weed/filer/abstract_sql/abstract_sql_store_kv.go
@@ -34,7 +34,7 @@ func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []by
 	}
 
 	_, err = res.RowsAffected()
-	if err != nil  {
+	if err != nil {
 		return fmt.Errorf("kv upsert no rows affected: %s", err)
 	}
 	return nil
diff --git a/weed/filer/entry.go b/weed/filer/entry.go
index dbe10c9b1..b7c8370e6 100644
--- a/weed/filer/entry.go
+++ b/weed/filer/entry.go
@@ -18,6 +18,7 @@ type Attr struct {
 	Replication   string      // replication
 	Collection    string      // collection name
 	TtlSec        int32       // ttl in seconds
+	DiskType      string
 	UserName      string
 	GroupNames    []string
 	SymlinkTarget string
diff --git a/weed/filer/entry_codec.go b/weed/filer/entry_codec.go
index 1693b551e..4c613f068 100644
--- a/weed/filer/entry_codec.go
+++ b/weed/filer/entry_codec.go
@@ -56,6 +56,7 @@ func EntryAttributeToPb(entry *Entry) *filer_pb.FuseAttributes {
 		Collection:    entry.Attr.Collection,
 		Replication:   entry.Attr.Replication,
 		TtlSec:        entry.Attr.TtlSec,
+		DiskType:      entry.Attr.DiskType,
 		UserName:      entry.Attr.UserName,
 		GroupName:     entry.Attr.GroupNames,
 		SymlinkTarget: entry.Attr.SymlinkTarget,
@@ -81,6 +82,7 @@ func PbToEntryAttribute(attr *filer_pb.FuseAttributes) Attr {
 	t.Collection = attr.Collection
 	t.Replication = attr.Replication
 	t.TtlSec = attr.TtlSec
+	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
diff --git a/weed/filer/filer_deletion.go b/weed/filer/filer_deletion.go
index 09af80b42..9eee38277 100644
--- a/weed/filer/filer_deletion.go
+++ b/weed/filer/filer_deletion.go
@@ -151,4 +151,3 @@ func (f *Filer) deleteChunksIfNotNew(oldEntry, newEntry *Entry) {
 	}
 	f.DeleteChunks(toDelete)
 }
-
diff --git a/weed/filer/read_write.go b/weed/filer/read_write.go
index 548473116..1f78057ef 100644
--- a/weed/filer/read_write.go
+++ b/weed/filer/read_write.go
@@ -82,8 +82,8 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
 
 	if err == filer_pb.ErrNotFound {
 		err = filer_pb.CreateEntry(client, &filer_pb.CreateEntryRequest{
-			Directory:          dir,
-			Entry:              &filer_pb.Entry{
+			Directory: dir,
+			Entry: &filer_pb.Entry{
 				Name:        name,
 				IsDirectory: false,
 				Attributes: &filer_pb.FuseAttributes{
@@ -92,7 +92,7 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
 					FileMode:    uint32(0644),
 					Collection:  "",
 					Replication: "",
-					FileSize: uint64(len(content)),
+					FileSize:    uint64(len(content)),
 				},
 				Content: content,
 			},
@@ -103,10 +103,10 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
 		entry.Attributes.Mtime = time.Now().Unix()
 		entry.Attributes.FileSize = uint64(len(content))
 		err = filer_pb.UpdateEntry(client, &filer_pb.UpdateEntryRequest{
-			Directory:          dir,
-			Entry:              entry,
+			Directory: dir,
+			Entry:     entry,
 		})
 	}
 
 	return err
-}
-\ No newline at end of file
+}