1ddfbbb194
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 3a5fa7ed90.
Conflicts:
defs.h
file.c
file.h
40 lines
735 B
C
40 lines
735 B
C
struct file {
|
|
enum { FD_NONE, FD_PIPE, FD_INODE } type;
|
|
int ref; // reference count
|
|
char readable;
|
|
char writable;
|
|
struct pipe *pipe;
|
|
struct inode *ip;
|
|
uint off;
|
|
};
|
|
|
|
|
|
// in-core file system types
|
|
|
|
struct inode {
|
|
uint dev; // Device number
|
|
uint inum; // Inode number
|
|
int ref; // Reference count
|
|
int flags; // I_BUSY, I_VALID
|
|
|
|
short type; // copy of disk inode
|
|
short major;
|
|
short minor;
|
|
short nlink;
|
|
uint size;
|
|
uint addrs[NDIRECT+1];
|
|
};
|
|
|
|
#define I_BUSY 0x1
|
|
#define I_VALID 0x2
|
|
|
|
// device implementations
|
|
|
|
struct devsw {
|
|
int (*read)(struct inode*, char*, int);
|
|
int (*write)(struct inode*, char*, int);
|
|
};
|
|
|
|
extern struct devsw devsw[];
|
|
|
|
#define CONSOLE 1
|