X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilesys%2Finode.c;fp=src%2Ffilesys%2Finode.c;h=9f7dfe80217ecb9376dec55a54542de8c19e49ec;hb=fba4443410241dd95c25a0fd7c5f8c0d8ff30ada;hp=be1df576dd1a52343a103ee8303c8ac36964c1f8;hpb=76d7f305a649ad998194b7b5184a07fa7544c360;p=pintos-anon diff --git a/src/filesys/inode.c b/src/filesys/inode.c index be1df57..9f7dfe8 100644 --- a/src/filesys/inode.c +++ b/src/filesys/inode.c @@ -5,6 +5,7 @@ #include #include #include "filesys/filesys.h" +#include "devices/partition.h" #include "threads/malloc.h" /* On-disk inode. @@ -77,9 +78,9 @@ inode_create (struct bitmap *free_map, disk_sector_t sector, off_t length) idx->start = start; /* Commit to disk. */ - disk_write (filesys_disk, sector, idx); + partition_write (filesys_partition, sector, idx); for (i = 0; i < bytes_to_sectors (length); i++) - disk_write (filesys_disk, idx->start + i, zero_sector); + partition_write (filesys_partition, idx->start + i, zero_sector); free (idx); return true; @@ -122,7 +123,7 @@ inode_open (disk_sector_t sector) /* Read from disk. */ ASSERT (sizeof idx->data == DISK_SECTOR_SIZE); - disk_read (filesys_disk, sector, &idx->data); + partition_read (filesys_partition, sector, &idx->data); return idx; } @@ -154,7 +155,7 @@ inode_close (struct inode *idx) static void deallocate_inode (const struct inode *idx) { - struct bitmap *free_map = bitmap_create (disk_size (filesys_disk)); + struct bitmap *free_map = bitmap_create (partition_size (filesys_partition)); if (free_map != NULL) { bitmap_read (free_map, free_map_file);