X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilesys%2Ffilesys.c;h=7a53f5ffd924ca7b1b384fd9b46b3256e14f30e6;hb=3b458804e1d0a460fb1c90f06f495b9f7a972424;hp=5df0d9d6b01145d7b132fab8cfa4577c039097da;hpb=c0206643b024b6f0e6cde1cbb5e7d37abbc84c69;p=pintos-anon

diff --git a/src/filesys/filesys.c b/src/filesys/filesys.c
index 5df0d9d..7a53f5f 100644
--- a/src/filesys/filesys.c
+++ b/src/filesys/filesys.c
@@ -6,10 +6,9 @@
 #include "filesys/free-map.h"
 #include "filesys/inode.h"
 #include "filesys/directory.h"
-#include "devices/disk.h"
 
-/* The disk that contains the file system. */
-struct disk *filesys_disk;
+/* Partition that contains the file system. */
+struct block *fs_device;
 
 static void do_format (void);
 
@@ -18,9 +17,9 @@ static void do_format (void);
 void
 filesys_init (bool format) 
 {
-  filesys_disk = disk_get (0, 1);
-  if (filesys_disk == NULL)
-    PANIC ("hd0:1 (hdb) not present, file system initialization failed");
+  fs_device = block_get_role (BLOCK_FILESYS);
+  if (fs_device == NULL)
+    PANIC ("No file system device found, can't initialize file system.");
 
   inode_init ();
   free_map_init ();
@@ -46,7 +45,7 @@ filesys_done (void)
 bool
 filesys_create (const char *name, off_t initial_size) 
 {
-  disk_sector_t inode_sector = 0;
+  block_sector_t inode_sector = 0;
   struct dir *dir = dir_open_root ();
   bool success = (dir != NULL
                   && free_map_allocate (1, &inode_sector)
@@ -91,65 +90,6 @@ filesys_remove (const char *name)
   return success;
 }
 
-static void must_succeed_function (int, bool) NO_INLINE;
-#define MUST_SUCCEED(EXPR) must_succeed_function (__LINE__, EXPR)
-
-/* Performs basic sanity checks on the file system.
-   The file system should not contain a file named `foo' when
-   called. */
-void
-filesys_self_test (void)
-{
-  static const char s[] = "This is a test string.";
-  static const char zeros[sizeof s] = {0};
-  struct file *file;
-  char s2[sizeof s];
-  int i;
-
-  filesys_remove ("foo");
-  for (i = 0; i < 2; i++) 
-    {
-      /* Create file and check that it contains zeros
-         throughout the created length. */
-      MUST_SUCCEED (filesys_create ("foo", sizeof s));
-      MUST_SUCCEED ((file = filesys_open ("foo")) != NULL);
-      MUST_SUCCEED (file_read (file, s2, sizeof s2) == sizeof s2);
-      MUST_SUCCEED (memcmp (s2, zeros, sizeof s) == 0);
-      MUST_SUCCEED (file_tell (file) == sizeof s);
-      MUST_SUCCEED (file_length (file) == sizeof s);
-      file_close (file);
-
-      /* Reopen file and write to it. */
-      MUST_SUCCEED ((file = filesys_open ("foo")) != NULL);
-      MUST_SUCCEED (file_write (file, s, sizeof s) == sizeof s);
-      MUST_SUCCEED (file_tell (file) == sizeof s);
-      MUST_SUCCEED (file_length (file) == sizeof s);
-      file_close (file);
-
-      /* Reopen file and verify that it reads back correctly.
-         Delete file while open to check proper semantics. */
-      MUST_SUCCEED ((file = filesys_open ("foo")) != NULL);
-      MUST_SUCCEED (filesys_remove ("foo"));
-      MUST_SUCCEED (filesys_open ("foo") == NULL);
-      MUST_SUCCEED (file_read (file, s2, sizeof s) == sizeof s);
-      MUST_SUCCEED (memcmp (s, s2, sizeof s) == 0);
-      MUST_SUCCEED (file_tell (file) == sizeof s);
-      MUST_SUCCEED (file_length (file) == sizeof s);
-      file_close (file);
-    }
-  
-  printf ("filesys: self test ok\n");
-}
-
-/* If SUCCESS is false, panics with an error complaining about
-   LINE_NO. */
-static void 
-must_succeed_function (int line_no, bool success) 
-{
-  if (!success)
-    PANIC ("filesys_self_test: operation failed on line %d", line_no);
-}
-
 /* Formats the file system. */
 static void
 do_format (void)