summaryrefslogtreecommitdiff
path: root/file.h
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-29 17:18:40 -0400
committerFrans Kaashoek <[email protected]>2011-08-29 17:18:40 -0400
commit1ddfbbb194e3aa668b33469eb547132a7a7f940a (patch)
tree41ad0ae10ef2743c6e9433e711358dede77ce041 /file.h
parent22f7db5336cb20c82eb1ffa45c0ef63825442c95 (diff)
downloadxv6-labs-1ddfbbb194e3aa668b33469eb547132a7a7f940a.tar.gz
xv6-labs-1ddfbbb194e3aa668b33469eb547132a7a7f940a.tar.bz2
xv6-labs-1ddfbbb194e3aa668b33469eb547132a7a7f940a.zip
Revert "Introduce and use sleeplocks instead of BUSY flags"
My changes have a race with re-used bufs and the code doesn't seem to get shorter Keep the changes that fixed ip->off race This reverts commit 3a5fa7ed9020eaf8ab843a16d26db7393b2ec072. Conflicts: defs.h file.c file.h
Diffstat (limited to 'file.h')
-rw-r--r--file.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/file.h b/file.h
index 2b4a2cb..d123696 100644
--- a/file.h
+++ b/file.h
@@ -15,9 +15,7 @@ struct inode {
uint dev; // Device number
uint inum; // Inode number
int ref; // Reference count
- int flags; // I_VALID
- struct spinlock lock;
- struct sleeplock sleeplock;
+ int flags; // I_BUSY, I_VALID
short type; // copy of disk inode
short major;
@@ -27,7 +25,8 @@ struct inode {
uint addrs[NDIRECT+1];
};
-#define I_VALID 0x1
+#define I_BUSY 0x1
+#define I_VALID 0x2
// device implementations