summaryrefslogtreecommitdiff
path: root/fs.h
diff options
context:
space:
mode:
authorrsc <rsc>2009-05-31 00:59:37 +0000
committerrsc <rsc>2009-05-31 00:59:37 +0000
commitba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5 (patch)
tree4ba105d444cc4e0f541486879f76d354ddbd6aaf /fs.h
parent030a47736fbb0febddce2647e5a80b98ca409695 (diff)
downloadxv6-labs-ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5.tar.gz
xv6-labs-ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5.tar.bz2
xv6-labs-ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5.zip
drop NADDRS and INDIRECT; too many names
Diffstat (limited to 'fs.h')
-rw-r--r--fs.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs.h b/fs.h
index c86483e..6f92592 100644
--- a/fs.h
+++ b/fs.h
@@ -15,11 +15,9 @@ struct superblock {
uint ninodes; // Number of inodes.
};
-#define NADDRS (NDIRECT+1)
#define NDIRECT 12
-#define INDIRECT 12
#define NINDIRECT (BSIZE / sizeof(uint))
-#define MAXFILE (NDIRECT + NINDIRECT)
+#define MAXFILE (NDIRECT + NINDIRECT)
// On-disk inode structure
struct dinode {
@@ -28,7 +26,7 @@ struct dinode {
short minor; // Minor device number (T_DEV only)
short nlink; // Number of links to inode in file system
uint size; // Size of file (bytes)
- uint addrs[NADDRS]; // Data block addresses
+ uint addrs[NDIRECT+1]; // Data block addresses
};
// Inodes per block.