Implement a proper block layer with partition support.

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

diff --git a/src/filesys/directory.h b/src/filesys/directory.h
index db168672b10b8672f6074567a59ce4f49cb18a11..930acf986df4b1a647cb8d7cbd01c522d1b2b786 100644 (file)
--- a/src/filesys/directory.h
+++ b/src/filesys/directory.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "devices/disk.h"
+#include "devices/block.h"
 
 /* Maximum length of a file name component.
    This is the traditional UNIX maximum length.
@@ -11,16 +11,20 @@
    retained, but much longer full path names must be allowed. */
 #define NAME_MAX 14
 
-struct file;
-struct dir *dir_create (size_t entry_cnt);
-size_t dir_size (size_t entry_cnt);
-void dir_destroy (struct dir *);
-void dir_read (struct dir *, struct file *);
-void dir_write (struct dir *, struct file *);
-bool dir_lookup (const struct dir *, const char *name, disk_sector_t *);
-bool dir_add (struct dir *, const char *name, disk_sector_t);
+struct inode;
+
+/* Opening and closing directories. */
+bool dir_create (block_sector_t sector, size_t entry_cnt);
+struct dir *dir_open (struct inode *);
+struct dir *dir_open_root (void);
+struct dir *dir_reopen (struct dir *);
+void dir_close (struct dir *);
+struct inode *dir_get_inode (struct dir *);
+
+/* Reading and writing. */
+bool dir_lookup (const struct dir *, const char *name, struct inode **);
+bool dir_add (struct dir *, const char *name, block_sector_t);
 bool dir_remove (struct dir *, const char *name);
-void dir_list (const struct dir *);
-void dir_dump (const struct dir *);
+bool dir_readdir (struct dir *, char name[NAME_MAX + 1]);
 
 #endif /* filesys/directory.h */