Cleanup

native_client_sdk/src/libraries/nacl_mounts/mount_mem.cc

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "nacl_mounts/mount_mem.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string>
 
@@ skipping 21 matching lines @@
   return (bool) (root_ != NULL);
 }
 
 void MountMem::Destroy() {
   if (root_)
     root_->Release();
   root_ = NULL;
 }
 
 MountNode* MountMem::AllocatePath(int mode) {
-  ino_t ino = AllocateINO();
-
-  MountNode *ptr = new MountNodeDir(this, ino, dev_);
-  if (!ptr->Init(mode, USR_ID, GRP_ID)) {
+  MountNode *ptr = new MountNodeDir(this);
+  if (!ptr->Init(mode)) {
     ptr->Release();
-    FreeINO(ino);
     return NULL;
   }
   return ptr;
 }
 
 MountNode* MountMem::AllocateData(int mode) {
-  ino_t ino = AllocateINO();
-
-  MountNode* ptr = new MountNodeMem(this, ino, dev_);
-  //if (!ptr->Init(mode, getuid(), getgid())) {
-  if (!ptr->Init(mode, USR_ID, GRP_ID)) {
+  MountNode* ptr = new MountNodeMem(this);
+  if (!ptr->Init(mode)) {
     ptr->Release();
-    FreeINO(ino);
     return NULL;
   }
   return ptr;
 }
 
-int MountMem::AllocateINO() {
-  const int INO_CNT = 8;
-
-  // If we run out of INO numbers, then allocate 8 more
-  if (inos_.size() == 0) {
-    max_ino_ += INO_CNT;
-    // Add eight more to the stack in reverse order, offset by 1
-    // since '0' refers to no INO.
-    for (int a = 0; a < INO_CNT; a++) {
-      inos_.push_back(max_ino_ - a);
-    }
-  }
-
-  // Return the INO at the top of the stack.
-  int val = inos_.back();
-  inos_.pop_back();
-  return val;
-}
-
-void MountMem::FreeINO(int ino) {
-  inos_.push_back(ino);
-}
-
 MountNode* MountMem::FindNode(const Path& path, int type) {
   MountNode* node = root_;
 
   // If there is no root there, we have an error.
   if (node == NULL) {
     errno = ENOTDIR;
     return NULL;
   }
 
   // We are expecting an "absolute" path from this mount point.
@@ skipping 173 matching lines @@
   if (file_only && child->IsaDir()) {
     errno = EISDIR;
     return -1;
   }
   if (remove_dir && child->ChildCount() > 0) {
     errno = ENOTEMPTY;
     return -1;
   }
   return parent->RemoveChild(path.Basename());
 }