Revise.

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

diff --git a/src/filesys/fsutil.c b/src/filesys/fsutil.c
index cc0e33500eb2a6ffad699e4342cd84cc40d22bf8..81466c2a66dfa008d7d3c1415a9211a392e733c5 100644 (file)
--- a/src/filesys/fsutil.c
+++ b/src/filesys/fsutil.c
@@ -25,9 +25,6 @@ char *fsutil_remove_file;
 /* List all files in the filesystem to the system console? */
 bool fsutil_list_files;
 
-/* Dump full contents of filesystem to the system console? */
-bool fsutil_dump_filesys;
-
 /* Copies from the "scratch" disk, hdc or hd1:0,
    to a file named FILENAME in the filesystem.
    The file will be SIZE bytes in length. */
@@ -55,7 +52,7 @@ copy_in (const char *filename, off_t size)
     PANIC ("%s: open failed", filename);
 
   /* Do copy. */
-  buffer = palloc_get (PAL_ASSERT);
+  buffer = palloc_get_page (PAL_ASSERT);
   sector = 0;
   while (size > 0)
     {
@@ -66,7 +63,7 @@ copy_in (const char *filename, off_t size)
                filename, (unsigned long long) size);
       size -= chunk_size;
     }
-  palloc_free (buffer);
+  palloc_free_page (buffer);
 
   file_close (dst);
 }
@@ -84,7 +81,7 @@ copy_out (const char *filename)
   off_t size;
   disk_sector_t sector;
 
-  buffer = palloc_get (PAL_ASSERT | PAL_ZERO);
+  buffer = palloc_get_page (PAL_ASSERT | PAL_ZERO);
 
   /* Open source file. */
   src = filesys_open (filename);
@@ -115,7 +112,7 @@ copy_out (const char *filename)
       disk_write (dst, sector++, buffer);
       size -= chunk_size;
     }
-  palloc_free (buffer);
+  palloc_free_page (buffer);
 
   file_close (src);
 }
@@ -144,9 +141,6 @@ fsutil_run (void)
 
   if (fsutil_list_files)
     filesys_list ();
-
-  if (fsutil_dump_filesys)
-    filesys_dump ();
 }
 
 /* Prints the contents of file FILENAME to the system console as
@@ -160,7 +154,7 @@ fsutil_print (const char *filename)
   file = filesys_open (filename);
   if (file == NULL)
     PANIC ("%s: open failed", filename);
-  buffer = palloc_get (PAL_ASSERT);
+  buffer = palloc_get_page (PAL_ASSERT);
   for (;;) 
     {
       off_t n = file_read (file, buffer, PGSIZE);
@@ -169,6 +163,6 @@ fsutil_print (const char *filename)
 
       hex_dump (0, buffer, n, true);
     }
-  palloc_free (buffer);
+  palloc_free_page (buffer);
   file_close (file);
 }