summaryrefslogtreecommitdiff
path: root/buf.h
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2015-04-03 08:22:02 -0400
committerFrans Kaashoek <[email protected]>2015-04-03 08:22:02 -0400
commitc24ac5d76353d04955cc348f1cb5b95743c42b38 (patch)
treecd58ba052fc238fe7f47a495c22c65e7d4bcbd45 /buf.h
parent7443b9649a6d83443439ae95458434038313b42b (diff)
downloadxv6-labs-c24ac5d76353d04955cc348f1cb5b95743c42b38.tar.gz
xv6-labs-c24ac5d76353d04955cc348f1cb5b95743c42b38.tar.bz2
xv6-labs-c24ac5d76353d04955cc348f1cb5b95743c42b38.zip
Disentangle block size from the disk's sector size. Set block size to 1024 to show
that they can be different. Clean up mkfs, simplifying specifying fs parameters, remove some redundancy between fs and mkfs, and fix disk layout bugs. Call blocks in the file system blocks instead of sectors. Passes usertests for different block sizes.
Diffstat (limited to 'buf.h')
-rw-r--r--buf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/buf.h b/buf.h
index 9c586f2..f18fd87 100644
--- a/buf.h
+++ b/buf.h
@@ -1,11 +1,11 @@
struct buf {
int flags;
uint dev;
- uint sector;
+ uint blockno;
struct buf *prev; // LRU cache list
struct buf *next;
struct buf *qnext; // disk queue
- uchar data[512];
+ uchar data[BSIZE];
};
#define B_BUSY 0x1 // buffer is locked by some process
#define B_VALID 0x2 // buffer has been read from disk