X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a4959ce78b69f1f4e0e59e2458af8d11bc1d5510..051ad2017b69ca8e438396b461525e485a896321:/services/keepstore/volume.go

diff --git a/services/keepstore/volume.go b/services/keepstore/volume.go
index 1f8fba5d06..6bce05bec0 100644
--- a/services/keepstore/volume.go
+++ b/services/keepstore/volume.go
@@ -12,6 +12,8 @@ import (
 	"math/big"
 	"sync/atomic"
 	"time"
+
+	"git.curoverse.com/arvados.git/sdk/go/arvados"
 )
 
 type BlockWriter interface {
@@ -287,12 +289,8 @@ type VolumeManager interface {
 
 // A VolumeMount is an attachment of a Volume to a VolumeManager.
 type VolumeMount struct {
-	UUID           string
-	DeviceID       string
-	ReadOnly       bool
-	Replication    int
-	StorageClasses []string
-	volume         Volume
+	arvados.KeepMount
+	volume Volume
 }
 
 // Generate a UUID the way API server would for a "KeepVolumeMount"
@@ -334,12 +332,14 @@ func MakeRRVolumeManager(volumes []Volume) *RRVolumeManager {
 			sc = []string{"default"}
 		}
 		mnt := &VolumeMount{
-			UUID:           (*VolumeMount)(nil).generateUUID(),
-			DeviceID:       v.DeviceID(),
-			ReadOnly:       !v.Writable(),
-			Replication:    v.Replication(),
-			StorageClasses: sc,
-			volume:         v,
+			KeepMount: arvados.KeepMount{
+				UUID:           (*VolumeMount)(nil).generateUUID(),
+				DeviceID:       v.DeviceID(),
+				ReadOnly:       !v.Writable(),
+				Replication:    v.Replication(),
+				StorageClasses: sc,
+			},
+			volume: v,
 		}
 		vm.iostats[v] = &ioStats{}
 		vm.mounts = append(vm.mounts, mnt)