meta: skip trash directories when handling rmr

juicedata · Jan 12, 2023 · 3fde56d · 3fde56d
1 parent c5875be
commit 3fde56d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/meta/utils.go b/pkg/meta/utils.go
@@ -292,15 +292,15 @@ func (m *baseMeta) emptyDir(ctx Context, inode Ino, count *uint64, concurrent ch
 			entries[i] = nil // release memory
 		}
 		wg.Wait()
-		if status != 0 {
+		if status != 0 || inode == TrashInode { // try only once for .trash
 			return status
 		}
 	}
 }
 
 func (m *baseMeta) emptyEntry(ctx Context, parent Ino, name string, inode Ino, count *uint64, concurrent chan int) syscall.Errno {
 	st := m.emptyDir(ctx, inode, count, concurrent)
-	if st == 0 {
+	if st == 0 && !isTrash(inode) {
 		st = m.Rmdir(ctx, parent, name)
 		if st == syscall.ENOTEMPTY {
 			st = m.emptyEntry(ctx, parent, name, inode, count, concurrent)