remove some references

Emyrk · Emyrk · commit 7555cffdaeba · 2025-06-20T10:26:28.000-05:00
diff --git a/coderd/files/closer.go b/coderd/files/closer.go
@@ -13,26 +13,29 @@ import (
 type CacheCloser struct {
 	cache FileAcquirer
 
-	close  []*CloseFS
-	mu     sync.Mutex
-	closed bool
+	closers []func()
+	mu      sync.Mutex
+	closed  bool
 }
 
 func NewCacheCloser(cache FileAcquirer) *CacheCloser {
 	return &CacheCloser{
-		cache: cache,
-		close: make([]*CloseFS, 0),
+		cache:   cache,
+		closers: make([]func(), 0),
 	}
 }
 
 func (c *CacheCloser) Close() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	for _, fs := range c.close {
-		fs.Close()
+	for _, doClose := range c.closers {
+		doClose()
 	}
 	c.closed = true
+
+	// Remove any references
+	c.closers = make([]func(), 0)
 }
 
 func (c *CacheCloser) Acquire(ctx context.Context, fileID uuid.UUID) (*CloseFS, error) {
@@ -48,7 +51,7 @@ func (c *CacheCloser) Acquire(ctx context.Context, fileID uuid.UUID) (*CloseFS,
 		return nil, err
 	}
 
-	c.close = append(c.close, f)
+	c.closers = append(c.closers, f.close)
 
 	return f, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -13,26 +13,29 @@ import (`
`13`	`13`	`type CacheCloser struct {`
`14`	`14`	`cache FileAcquirer`
`15`	`15`
`16`		`- close []*CloseFS`
`17`		`- mu sync.Mutex`
`18`		`- closed bool`
	`16`	`+ closers []func()`
	`17`	`+ mu sync.Mutex`
	`18`	`+ closed bool`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func NewCacheCloser(cache FileAcquirer) *CacheCloser {`
`22`	`22`	`return &CacheCloser{`
`23`		`- cache: cache,`
`24`		`- close: make([]*CloseFS, 0),`
	`23`	`+ cache: cache,`
	`24`	`+ closers: make([]func(), 0),`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (c *CacheCloser) Close() {`
`29`	`29`	`c.mu.Lock()`
`30`	`30`	`defer c.mu.Unlock()`
`31`	`31`
`32`		`- for _, fs := range c.close {`
`33`		`- fs.Close()`
	`32`	`+ for _, doClose := range c.closers {`
	`33`	`+ doClose()`
`34`	`34`	`}`
`35`	`35`	`c.closed = true`
	`36`	`+`
	`37`	`+ // Remove any references`
	`38`	`+ c.closers = make([]func(), 0)`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`func (c CacheCloser) Acquire(ctx context.Context, fileID uuid.UUID) (CloseFS, error) {`
`@@ -48,7 +51,7 @@ func (c CacheCloser) Acquire(ctx context.Context, fileID uuid.UUID) (CloseFS,`
`48`	`51`	`return nil, err`
`49`	`52`	`}`
`50`	`53`
`51`		`- c.close = append(c.close, f)`
	`54`	`+ c.closers = append(c.closers, f.close)`
`52`	`55`
`53`	`56`	`return f, nil`
`54`	`57`	`}`