fs: remove testonly methods from mapIdentityTable

Change-Id: I22d43d80e53f37149d8a8699d67a86f86a6a6964

Author: hanwen

fs/forget_test.go

@@ -106,7 +106,9 @@ func TestForget(t *testing.T) {
 	time.Sleep(ttl)
 
 	bridge := rawFS.(*rawBridge)
-	l := bridge.ids.nodeCount()
+	bridge.ids.mu.Lock()
+	l := len(bridge.ids.nodes)
+	bridge.ids.mu.Unlock()
 	if l != 1 {
 		t.Fatalf("got %d live nodes, want 1", l)
 	}

fs/identitytable.go

@@ -285,19 +285,3 @@ func (t *mapIdentityTable) recycleFile(fh uint32) {
 	defer t.mu.Unlock()
 	t.freeFiles = append(t.freeFiles, fh)
 }
-
-// nodeCount returns the number of currently registered nodes. Used by
-// tests.
-func (t *mapIdentityTable) nodeCount() int {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	return len(t.nodes)
-}
-
-// fileCount returns the size of the file handle table (including
-// unallocated/free slots). Used by tests.
-func (t *mapIdentityTable) fileCount() int {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	return len(t.files)
-}

fs/simple_test.go

@@ -190,8 +190,12 @@ func TestFileFdLeak(t *testing.T) {
 	bridge := tc.rawFS.(*rawBridge)
 	tc = nil
 
+	bridge.ids.mu.Lock()
+	got := len(bridge.ids.files)
+	bridge.ids.mu.Unlock()
+
 	// posixtest.FdLeak also uses 15 as a limit.
-	if got, want := bridge.ids.fileCount(), 15; got > want {
+	if want := 15; got > want {
 		t.Errorf("found %d used file handles, should be <= %d", got, want)
 	}
 }