From cea0fb8b4897d9526c14409e86a227fdf8debf2a Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Tue, 17 Mar 2015 13:33:32 +1100
Subject: [PATCH] Refactored ID methods.

---
 samples/cachingfs/caching_fs.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/samples/cachingfs/caching_fs.go b/samples/cachingfs/caching_fs.go
index dffb33a..e304a49 100644
--- a/samples/cachingfs/caching_fs.go
+++ b/samples/cachingfs/caching_fs.go
@@ -120,13 +120,19 @@ func (fs *cachingFS) checkInvariants() {
 }
 
 // LOCKS_REQUIRED(fs.mu)
-func (fs *cachingFS) fooID() fuse.InodeID
+func (fs *cachingFS) fooID() fuse.InodeID {
+	return fs.baseID + fooOffset
+}
 
 // LOCKS_REQUIRED(fs.mu)
-func (fs *cachingFS) dirID() fuse.InodeID
+func (fs *cachingFS) dirID() fuse.InodeID {
+	return fs.baseID + dirOffset
+}
 
 // LOCKS_REQUIRED(fs.mu)
-func (fs *cachingFS) barID() fuse.InodeID
+func (fs *cachingFS) barID() fuse.InodeID {
+	return fs.baseID + barOffset
+}
 
 // LOCKS_REQUIRED(fs.mu)
 func (fs *cachingFS) fooAttrs() fuse.InodeAttributes
@@ -146,7 +152,7 @@ func (fs *cachingFS) FooID() fuse.InodeID {
 	fs.mu.Lock()
 	defer fs.mu.Unlock()
 
-	return fs.baseID + fooOffset
+	return fs.fooID()
 }
 
 // LOCKS_EXCLUDED(fs.mu)
@@ -154,7 +160,7 @@ func (fs *cachingFS) DirID() fuse.InodeID {
 	fs.mu.Lock()
 	defer fs.mu.Unlock()
 
-	return fs.baseID + dirOffset
+	return fs.dirID()
 }
 
 // LOCKS_EXCLUDED(fs.mu)
@@ -162,7 +168,7 @@ func (fs *cachingFS) BarID() fuse.InodeID {
 	fs.mu.Lock()
 	defer fs.mu.Unlock()
 
-	return fs.baseID + barOffset
+	return fs.barID()
 }
 
 // LOCKS_EXCLUDED(fs.mu)