summaryrefslogtreecommitdiff
path: root/buf.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 /buf.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 'buf.h')
-rw-r--r--buf.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/buf.h b/buf.h
index cfeb8c6..9c586f2 100644
--- a/buf.h
+++ b/buf.h
@@ -2,13 +2,12 @@ struct buf {
int flags;
uint dev;
uint sector;
- struct spinlock lock;
- struct sleeplock sleeplock;
struct buf *prev; // LRU cache list
struct buf *next;
struct buf *qnext; // disk queue
uchar data[512];
};
-#define B_VALID 0x1 // buffer has been read from disk
-#define B_DIRTY 0x2 // buffer needs to be written to disk
+#define B_BUSY 0x1 // buffer is locked by some process
+#define B_VALID 0x2 // buffer has been read from disk
+#define B_DIRTY 0x4 // buffer needs to be written to disk