From 0c7f483838c48db05e7ea44232a55135d7c262a0 Mon Sep 17 00:00:00 2001
From: rsc <rsc>
Date: Sun, 31 May 2009 00:26:10 +0000
Subject: [PATCH] move T_DIR etc into stat.h; move type up
---
fs.h | 4 ----
mkfs.c | 1 +
stat.h | 6 +++++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs.h b/fs.h
index a7d93b4..c86483e 100644
--- a/fs.h
+++ b/fs.h
@@ -31,10 +31,6 @@ struct dinode {
uint addrs[NADDRS]; // Data block addresses
};
-#define T_DIR 1 // Directory
-#define T_FILE 2 // File
-#define T_DEV 3 // Special device
-
// Inodes per block.
#define IPB (BSIZE / sizeof(struct dinode))
diff --git a/mkfs.c b/mkfs.c
index 3046f9b..24a4b4f 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -6,6 +6,7 @@
#include <assert.h>
#include "types.h"
#include "fs.h"
+#include "stat.h"
int nblocks = 995;
int ninodes = 200;
diff --git a/stat.h b/stat.h
index bc3a06c..604fa9c 100644
--- a/stat.h
+++ b/stat.h
@@ -1,7 +1,11 @@
+#define T_DIR 1 // Directory
+#define T_FILE 2 // File
+#define T_DEV 3 // Special device
+
struct stat {
+ short type; // Type of file
int dev; // Device number
uint ino; // Inode number on device
- short type; // Type of file
short nlink; // Number of links to file
uint size; // Size of file in bytes
};
--
GitLab