From ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5 Mon Sep 17 00:00:00 2001
From: rsc <rsc>
Date: Sun, 31 May 2009 00:59:37 +0000
Subject: drop NADDRS and INDIRECT; too many names

---
 fs.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'fs.h')

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.
-- 
cgit v1.2.3