butonic
diff --git a/‎pkg/storage/utils/decomposedfs/decomposedfs.go
+8-46 b/‎pkg/storage/utils/decomposedfs/decomposedfs.go
+8-46
diff --git a/‎pkg/storage/utils/decomposedfs/grants.go
+2-3 b/‎pkg/storage/utils/decomposedfs/grants.go
+2-3
diff --git a/‎pkg/storage/utils/decomposedfs/lookup.go
+20-21 b/‎pkg/storage/utils/decomposedfs/lookup.go
+20-21
@@ -34,6 +34,7 @@ import (
 	"syscall"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
+	rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"github.com/cs3org/reva/pkg/appctx"
 	ctxpkg "github.com/cs3org/reva/pkg/ctx"
@@ -204,57 +205,18 @@ func (fs *Decomposedfs) CreateHome(ctx context.Context) (err error) {
 		return errtypes.NotSupported("Decomposedfs: CreateHome() home supported disabled")
 	}
 
-	var n, h *node.Node
-	if n, err = fs.lu.RootNode(ctx); err != nil {
-		return
-	}
-	h, err = fs.lu.WalkPath(ctx, n, fs.lu.mustGetUserLayout(ctx), false, func(ctx context.Context, n *node.Node) error {
-		if !n.Exists {
-			if err := fs.tp.CreateDir(ctx, n); err != nil {
-				return err
-			}
-		}
-		return nil
+	u := ctxpkg.ContextMustGetUser(ctx)
+	res, err := fs.CreateStorageSpace(ctx, &provider.CreateStorageSpaceRequest{
+		Type:  spaceTypePersonal,
+		Owner: u,
 	})
-
-	// make sure to delete the created directory if things go wrong
-	defer func() {
-		if err != nil {
-			// do not catch the error to not shadow the original error
-			if tmpErr := fs.tp.Delete(ctx, n); tmpErr != nil {
-				appctx.GetLogger(ctx).Error().Err(tmpErr).Msg("Can not revert file system change after error")
-			}
-		}
-	}()
-
 	if err != nil {
-		return
-	}
-
-	// update the owner
-	u := ctxpkg.ContextMustGetUser(ctx)
-	if err = h.WriteAllNodeMetadata(u.Id); err != nil {
-		return
-	}
-
-	if fs.o.TreeTimeAccounting || fs.o.TreeSizeAccounting {
-		// mark the home node as the end of propagation
-		if err = h.SetMetadata(xattrs.PropagationAttr, "1"); err != nil {
-			appctx.GetLogger(ctx).Error().Err(err).Interface("node", h).Msg("could not mark home as propagation root")
-			return
-		}
-	}
-
-	if err := h.SetMetadata(xattrs.SpaceNameAttr, u.DisplayName); err != nil {
 		return err
 	}
-
-	// add storage space
-	if err := fs.createStorageSpace(ctx, spaceTypePersonal, h.ID); err != nil {
-		return err
+	if res.Status.Code != rpcv1beta1.Code_CODE_OK {
+		return errtypes.NewErrtypeFromStatus(res.Status)
 	}
-
-	return
+	return nil
 }
 
 // The os not exists error is buried inside the xattr error,
 
@@ -122,7 +122,7 @@ func (fs *Decomposedfs) ListGrants(ctx context.Context, ref *provider.Reference)
 	}
 
 	log := appctx.GetLogger(ctx)
-	np := fs.lu.InternalPath(node.ID)
+	np := node.InternalPath()
 	var attrs []string
 	if attrs, err = xattr.List(np); err != nil {
 		log.Error().Err(err).Msg("error listing attributes")
@@ -174,8 +174,7 @@ func (fs *Decomposedfs) RemoveGrant(ctx context.Context, ref *provider.Reference
 		attr = xattrs.GrantUserAcePrefix + g.Grantee.GetUserId().OpaqueId
 	}
 
-	np := fs.lu.InternalPath(node.ID)
-	if err = xattr.Remove(np, attr); err != nil {
+	if err = xattr.Remove(node.InternalPath(), attr); err != nil {
 		return
 	}
 
 
@@ -21,7 +21,6 @@ package decomposedfs
 import (
 	"context"
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -58,6 +57,7 @@ func (lu *Lookup) NodeFromResource(ctx context.Context, ref *provider.Reference)
 				if err != nil {
 					return nil, err
 				}
+				n.SpaceID = ref.ResourceId.StorageId
 			}
 		}
 		return n, nil
@@ -76,32 +76,31 @@ func (lu *Lookup) NodeFromID(ctx context.Context, id *provider.ResourceId) (n *n
 		// The Resource references the root of a space
 		return lu.NodeFromSpaceID(ctx, id)
 	}
-	n, err = node.ReadNode(ctx, lu, id.OpaqueId)
+	n, err = node.ReadNode(ctx, lu, id.StorageId, id.OpaqueId)
 	if err != nil {
 		return nil, err
 	}
 
 	return n, n.FindStorageSpaceRoot()
 }
 
-// NodeFromSpaceID converts a resource id without an opaque id into a Node
-func (lu *Lookup) NodeFromSpaceID(ctx context.Context, id *provider.ResourceId) (n *node.Node, err error) {
-	d := filepath.Join(lu.Options.Root, "spaces", spaceTypeAny, id.StorageId)
-	matches, err := filepath.Glob(d)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(matches) != 1 {
-		return nil, fmt.Errorf("can't determine node from spaceID: found %d matching spaces. Path: %s", len(matches), d)
-	}
-
-	target, err := os.Readlink(matches[0])
-	if err != nil {
-		appctx.GetLogger(ctx).Error().Err(err).Str("match", matches[0]).Msg("could not read link, skipping")
+func Pathify(id string, depth, width int) string {
+	b := strings.Builder{}
+	i := 0
+	for ; i < depth; i++ {
+		if len(id) <= i*width+width {
+			break
+		}
+		b.WriteString(id[i*width : i*width+width])
+		b.WriteRune(filepath.Separator)
 	}
+	b.WriteString(id[i*width:])
+	return b.String()
+}
 
-	node, err := node.ReadNode(ctx, lu, filepath.Base(target))
+// NodeFromSpaceID converts a resource id without an opaque id into a Node
+func (lu *Lookup) NodeFromSpaceID(ctx context.Context, id *provider.ResourceId) (n *node.Node, err error) {
+	node, err := node.ReadNode(ctx, lu, id.StorageId, id.StorageId)
 	if err != nil {
 		return nil, err
 	}
@@ -130,7 +129,7 @@ func (lu *Lookup) Path(ctx context.Context, n *node.Node) (p string, err error)
 
 // RootNode returns the root node of the storage
 func (lu *Lookup) RootNode(ctx context.Context) (*node.Node, error) {
-	n := node.New(node.RootID, "", "", 0, "", nil, lu)
+	n := node.New(node.NoSpaceID, node.RootID, "", "", 0, "", nil, lu)
 	n.Exists = true
 	return n, nil
 }
@@ -182,8 +181,8 @@ func (lu *Lookup) InternalRoot() string {
 }
 
 // InternalPath returns the internal path for a given ID
-func (lu *Lookup) InternalPath(id string) string {
-	return filepath.Join(lu.Options.Root, "nodes", id)
+func (lu *Lookup) InternalPath(spaceID, nodeID string) string {
+	return filepath.Join(lu.Options.Root, "spaces", Pathify(spaceID, 1, 2), "nodes", Pathify(nodeID, 4, 2))
 }
 
 func (lu *Lookup) mustGetUserLayout(ctx context.Context) string {
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func (fs Decomposedfs) ListGrants(ctx context.Context, ref provider.Reference)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`log := appctx.GetLogger(ctx)`
`125`		`- np := fs.lu.InternalPath(node.ID)`
	`125`	`+ np := node.InternalPath()`
`126`	`126`	`var attrs []string`
`127`	`127`	`if attrs, err = xattr.List(np); err != nil {`
`128`	`128`	`log.Error().Err(err).Msg("error listing attributes")`
`@@ -174,8 +174,7 @@ func (fs Decomposedfs) RemoveGrant(ctx context.Context, ref provider.Reference`
`174`	`174`	`attr = xattrs.GrantUserAcePrefix + g.Grantee.GetUserId().OpaqueId`
`175`	`175`	`}`
`176`	`176`
`177`		`- np := fs.lu.InternalPath(node.ID)`
`178`		`- if err = xattr.Remove(np, attr); err != nil {`
	`177`	`+ if err = xattr.Remove(node.InternalPath(), attr); err != nil {`
`179`	`178`	`return`
`180`	`179`	`}`
`181`	`180`