Redo makefiles.

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

diff --git a/src/filesys/file.c b/src/filesys/file.c
index e16ff5fc695630cc55b4571f36d27a9d1f3e3fbb..a40c07356e2a9de62ea1bc118cb05a8ec0e083fa 100644 (file)
--- a/src/filesys/file.c
+++ b/src/filesys/file.c
@@ -1,13 +1,13 @@
 #include "file.h"
-#include "debug.h"
-#include "lib.h"
-#include "malloc.h"
 #include "directory.h"
 #include "filehdr.h"
 #include "filesys.h"
+#include "lib/debug.h"
+#include "lib/lib.h"
+#include "threads/malloc.h"
 
 bool
-file_open (struct file *file, disk_sector_no hdr_sector) 
+file_open (struct file *file, disk_sector_t hdr_sector) 
 {
   file->hdr = filehdr_read (hdr_sector);
   file->bounce = malloc (DISK_SECTOR_SIZE);
@@ -119,7 +119,6 @@ file_write_at (struct file *file, const void *buffer_, off_t size,
       file_ofs += chunk_size;
       bytes_written += chunk_size;
     }
-  free (file->bounce);
 
   return bytes_written;
 }