projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start work on partition support.
[pintos-anon]
/
src
/
filesys
/
inode.c
diff --git
a/src/filesys/inode.c
b/src/filesys/inode.c
index be1df576dd1a52343a103ee8303c8ac36964c1f8..9f7dfe80217ecb9376dec55a54542de8c19e49ec 100644
(file)
--- a/
src/filesys/inode.c
+++ b/
src/filesys/inode.c
@@
-5,6
+5,7
@@
#include <round.h>
#include <stdio.h>
#include "filesys/filesys.h"
#include <round.h>
#include <stdio.h>
#include "filesys/filesys.h"
+#include "devices/partition.h"
#include "threads/malloc.h"
/* On-disk inode.
#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. */
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++)
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;
free (idx);
return true;
@@
-122,7
+123,7
@@
inode_open (disk_sector_t sector)
/* Read from disk. */
ASSERT (sizeof idx->data == DISK_SECTOR_SIZE);
/* 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;
}
return idx;
}
@@
-154,7
+155,7
@@
inode_close (struct inode *idx)
static void
deallocate_inode (const 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);
if (free_map != NULL)
{
bitmap_read (free_map, free_map_file);