Merge pull request #4464 from aduffeck/dont-check-locks-grants

Dont check locks grants
cs3org · Jan 22, 2024 · d79f163 · d79f163
2 parents 9641661 + d9cf730
commit d79f163
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/changelog/unreleased/allow-changing-grants-when-locked.md b/changelog/unreleased/allow-changing-grants-when-locked.md
@@ -0,0 +1,5 @@
+Bugfix: Do not lose revisions when restoring the first revision
+
+We no longer prevent modifying grants on locked resources.
+
+https://github.com/cs3org/reva/pull/4464
diff --git a/pkg/storage/utils/decomposedfs/grants.go b/pkg/storage/utils/decomposedfs/grants.go
@@ -197,11 +197,6 @@ func (fs *Decomposedfs) RemoveGrant(ctx context.Context, ref *provider.Reference
 		}
 	}
 
-	// check lock
-	if err := grantNode.CheckLock(ctx); err != nil {
-		return err
-	}
-
 	if err := grantNode.DeleteGrant(ctx, g, false); err != nil {
 		return err
 	}
@@ -308,11 +303,6 @@ func (fs *Decomposedfs) loadGrant(ctx context.Context, ref *provider.Reference,
 }
 
 func (fs *Decomposedfs) storeGrant(ctx context.Context, n *node.Node, g *provider.Grant) error {
-	// check lock
-	if err := n.CheckLock(ctx); err != nil {
-		return err
-	}
-
 	var spaceType string
 	spaceGrant := ctx.Value(utils.SpaceGrant)
 	// this is not a grant on a space root we are just adding a share