summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 18:40:28 +0000
committerrsc <rsc>2006-09-06 18:40:28 +0000
commit9936bffa45c928ead9660a0df32d08a50b2b09c2 (patch)
tree096bfa5d4ce6dacdb540938beba5932b85a7815a
parent39593d2f1aab1355d61b75c041b31a88d2043a04 (diff)
downloadxv6-labs-9936bffa45c928ead9660a0df32d08a50b2b09c2.tar.gz
xv6-labs-9936bffa45c928ead9660a0df32d08a50b2b09c2.tar.bz2
xv6-labs-9936bffa45c928ead9660a0df32d08a50b2b09c2.zip
fd.* -> file.*
-rw-r--r--Makefile4
-rw-r--r--file.c (renamed from fd.c)2
-rw-r--r--file.h (renamed from fd.h)0
-rw-r--r--pipe.c2
-rw-r--r--proc.c2
-rw-r--r--syscall.c2
-rw-r--r--sysfile.c2
-rw-r--r--sysproc.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 9d1e1d6..ae45363 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
OBJS = \
console.o\
- fd.o\
+ file.o\
ide.o\
kalloc.o\
lapic.o\
@@ -66,7 +66,7 @@ PRINT = \
bootasm.S bootother.S main.c init.c spinlock.c\
proc.h proc.c setjmp.S kalloc.c\
syscall.h trapasm.S traps.h trap.c vectors.pl syscall.c\
- buf.h dev.h fcntl.h stat.h fd.h fs.h fsvar.h fd.c fs.c bio.c ide.c\
+ buf.h dev.h fcntl.h stat.h file.h fs.h fsvar.h fd.c fs.c bio.c ide.c\
pipe.c\
mp.h ioapic.h mp.c lapic.c ioapic.c picirq.c\
console.c\
diff --git a/fd.c b/file.c
index 9ec3038..fd04383 100644
--- a/fd.c
+++ b/file.c
@@ -5,7 +5,7 @@
#include "mmu.h"
#include "proc.h"
#include "defs.h"
-#include "fd.h"
+#include "file.h"
#include "spinlock.h"
#include "dev.h"
#include "fs.h"
diff --git a/fd.h b/file.h
index 15d6b78..15d6b78 100644
--- a/fd.h
+++ b/file.h
diff --git a/pipe.c b/pipe.c
index 2864432..3b2f6b8 100644
--- a/pipe.c
+++ b/pipe.c
@@ -4,7 +4,7 @@
#include "mmu.h"
#include "proc.h"
#include "defs.h"
-#include "fd.h"
+#include "file.h"
#include "spinlock.h"
#define PIPESIZE 512
diff --git a/proc.c b/proc.c
index 066ac77..34b353b 100644
--- a/proc.c
+++ b/proc.c
@@ -2,7 +2,7 @@
#include "mmu.h"
#include "x86.h"
#include "param.h"
-#include "fd.h"
+#include "file.h"
#include "proc.h"
#include "defs.h"
#include "spinlock.h"
diff --git a/syscall.c b/syscall.c
index f75714a..4cff057 100644
--- a/syscall.c
+++ b/syscall.c
@@ -12,7 +12,7 @@
#include "fs.h"
#include "fsvar.h"
#include "elf.h"
-#include "fd.h"
+#include "file.h"
#include "fcntl.h"
// User code makes a system call with INT T_SYSCALL.
diff --git a/sysfile.c b/sysfile.c
index d123a96..d0c7afa 100644
--- a/sysfile.c
+++ b/sysfile.c
@@ -12,7 +12,7 @@
#include "fs.h"
#include "fsvar.h"
#include "elf.h"
-#include "fd.h"
+#include "file.h"
#include "fcntl.h"
int
diff --git a/sysproc.c b/sysproc.c
index f648c0e..43ee973 100644
--- a/sysproc.c
+++ b/sysproc.c
@@ -12,7 +12,7 @@
#include "fs.h"
#include "fsvar.h"
#include "elf.h"
-#include "fd.h"
+#include "file.h"
#include "fcntl.h"
int