Fix MemMapFs.Remove() to really delete the file.

It was attempting to delete a file with a hardcoded path of "name" as
opposed to the path in the `name` variable.

Fixing this exposed a deadlock because the function was attempting to
acquire an exclusive lock when it already had a read lock.

fs_test.go

@@ -114,6 +114,24 @@ func TestRename(t *testing.T) {
 	}
 }
 
+func TestRemove(t *testing.T) {
+	for _, fs := range Fss {
+		path := testDir + "/" + testName
+		fs.MkdirAll(testDir, 0777) // Just in case.
+		fs.Create(path)
+
+		err := fs.Remove(path)
+		if err != nil {
+			t.Fatalf("%v: Remove() failed: %v", fs.Name(), err)
+		}
+
+		_, err = fs.Stat(path)
+		if !os.IsNotExist(err) {
+			t.Errorf("%v: Remove() didn't remove file", fs.Name())
+		}
+	}
+}
+
 func TestTruncate(t *testing.T) {
 	for _, fs := range Fss {
 		f := newFile("TestTruncate", fs, t)

memmap.go

@@ -173,13 +173,11 @@ func (m *MemMapFs) OpenFile(name string, flag int, perm os.FileMode) (File, erro
 }
 
 func (m *MemMapFs) Remove(name string) error {
-	m.rlock()
+	m.lock()
-	defer m.runlock()
+	defer m.unlock()
 
-	if _, ok := m.getData()["name"]; ok {
+	if _, ok := m.getData()[name]; ok {
-		m.lock()
 		delete(m.getData(), name)
-		m.unlock()
 	}
 	return nil
 }