adjusting for types

weed-fs/src/pkg/storage/store.go

@@ -7,7 +7,6 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"pkg/topology"
 	"pkg/util"
 )
 
@@ -60,20 +59,20 @@ func (s *Store) addVolume(vid VolumeId) error {
 	s.volumes[vid] = NewVolume(s.dir, vid)
 	return nil
 }
-func (s *Store) Status() *[]*topology.VolumeInfo {
-	stats := new([]*topology.VolumeInfo)
+func (s *Store) Status() *[]*VolumeInfo {
+	stats := new([]*VolumeInfo)
 	for k, v := range s.volumes {
-		s := new(topology.VolumeInfo)
-		s.Id, s.Size = topology.VolumeId(k), v.Size()
+		s := new(VolumeInfo)
+		s.Id, s.Size = VolumeId(k), v.Size()
 		*stats = append(*stats, s)
 	}
 	return stats
 }
 func (s *Store) Join(mserver string) {
-	stats := new([]*topology.VolumeInfo)
+	stats := new([]*VolumeInfo)
 	for k, v := range s.volumes {
-		s := new(topology.VolumeInfo)
-		s.Id, s.Size = topology.VolumeId(k), v.Size()
+		s := new(VolumeInfo)
+		s.Id, s.Size = VolumeId(k), v.Size()
 		*stats = append(*stats, s)
 	}
 	bytes, _ := json.Marshal(stats)

weed-fs/src/pkg/storage/volume.go

@@ -14,6 +14,10 @@ const (
 )
 
 type VolumeId uint32
+type VolumeInfo struct {
+  Id   VolumeId
+  Size int64
+}
 func NewVolumeId(vid string) (VolumeId,error) {
   volumeId, err := strconv.ParseUint(vid, 10, 64)
   return VolumeId(volumeId), err