From c5cb83c2e326ceedb216b692a6260e7f61fa2c81 Mon Sep 17 00:00:00 2001 From: Julio Lopez Date: Fri, 8 Nov 2019 00:51:17 -0800 Subject: [PATCH] Rename Cache.c.getEntriesFromCacheLocked Follows the naming convention for the locking requirements --- fs/cachefs/cache.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/cachefs/cache.go b/fs/cachefs/cache.go index 2486e400d..35f969344 100644 --- a/fs/cachefs/cache.go +++ b/fs/cachefs/cache.go @@ -89,7 +89,7 @@ func (c *Cache) Readdir(ctx context.Context, d fs.Directory) (fs.Entries, error) return d.Readdir(ctx) } -func (c *Cache) getEntriesFromCache(id string) fs.Entries { +func (c *Cache) getEntriesFromCacheLocked(id string) fs.Entries { if v, ok := c.data[id]; id != "" && ok { if time.Now().Before(v.expireAfter) { c.moveToHead(v) @@ -118,7 +118,7 @@ func (c *Cache) getEntries(ctx context.Context, id string, expirationTime time.D c.mu.Lock() defer c.mu.Unlock() - if entries := c.getEntriesFromCache(id); entries != nil { + if entries := c.getEntriesFromCacheLocked(id); entries != nil { return entries, nil }