From 355549e773d1ea916002b7441d09f6f87e475c8c Mon Sep 17 00:00:00 2001 From: tmourati Date: Wed, 14 Oct 2020 15:11:35 +0200 Subject: [PATCH] fixup --- pkg/storage/utils/cephfs/cephfs.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/storage/utils/cephfs/cephfs.go b/pkg/storage/utils/cephfs/cephfs.go index ad5f9be874a..615c92baccb 100644 --- a/pkg/storage/utils/cephfs/cephfs.go +++ b/pkg/storage/utils/cephfs/cephfs.go @@ -54,7 +54,6 @@ type Config struct { Uploads string `mapstructure:"uploads"` DataDirectory string `mapstructure:"data_directory"` RecycleBin string `mapstructure:"recycle_bin"` - Versions string `mapstructure:"versions"` Shadow string `mapstructure:"shadow"` References string `mapstructure:"references"` } @@ -86,8 +85,6 @@ func (c *Config) init() { c.References = path.Join(c.Shadow, "references") c.RecycleBin = path.Join(c.Shadow, "recycle_bin") - c.Versions = path.Join(c.Shadow, "versions") - } func (gl *Global) init(c *Config) { @@ -116,7 +113,7 @@ func NewCephFS(c *Config) (storage.FS, error) { c.init() // create namespaces if they do not exist - namespaces := []string{c.DataDirectory, c.Uploads, c.Shadow, c.References, c.RecycleBin, c.Versions} + namespaces := []string{c.DataDirectory, c.Uploads, c.Shadow, c.References, c.RecycleBin} for _, v := range namespaces { if err := os.MkdirAll(v, 0755); err != nil { return nil, errors.Wrap(err, "could not create home dir "+v) @@ -230,7 +227,7 @@ func (fs *cephfs) wrapSnap(key string) string { } func (fs *cephfs) unwrap(ctx context.Context, np string) string { - ns := fs.getNsMatch(np, []string{fs.conf.DataDirectory, fs.conf.References, fs.conf.RecycleBin, fs.conf.Versions}) + ns := fs.getNsMatch(np, []string{fs.conf.DataDirectory, fs.conf.References, fs.conf.RecycleBin}) var external string if !fs.conf.DisableHome { layout, err := fs.GetHome(ctx)