Implement a proper block layer with partition support.

[pintos-anon] / src / filesys / directory.c

diff --git a/src/filesys/directory.c b/src/filesys/directory.c
index 0d265d5da78b7be2ca705a5a9b7eeacfbcd5dfd2..030c1c9b0dbaf9b3a41a4decaadd7c76793b1d63 100644 (file)
--- a/src/filesys/directory.c
+++ b/src/filesys/directory.c
@@ -16,7 +16,7 @@ struct dir
 /* A single directory entry. */
 struct dir_entry 
   {
-    disk_sector_t inode_sector;         /* Sector number of header. */
+    block_sector_t inode_sector;        /* Sector number of header. */
     char name[NAME_MAX + 1];            /* Null terminated file name. */
     bool in_use;                        /* In use or free? */
   };
@@ -24,7 +24,7 @@ struct dir_entry
 /* Creates a directory with space for ENTRY_CNT entries in the
    given SECTOR.  Returns true if successful, false on failure. */
 bool
-dir_create (disk_sector_t sector, size_t entry_cnt) 
+dir_create (block_sector_t sector, size_t entry_cnt)
 {
   return inode_create (sector, entry_cnt * sizeof (struct dir_entry));
 }
@@ -139,12 +139,12 @@ dir_lookup (const struct dir *dir, const char *name,
    Fails if NAME is invalid (i.e. too long) or a disk or memory
    error occurs. */
 bool
-dir_add (struct dir *dir, const char *name, disk_sector_t inode_sector) 
+dir_add (struct dir *dir, const char *name, block_sector_t inode_sector)
 {
   struct dir_entry e;
   off_t ofs;
   bool success = false;
-  
+
   ASSERT (dir != NULL);
   ASSERT (name != NULL);