diff options
Diffstat (limited to 'src/cmd/fossil/dat.h')
| -rw-r--r-- | src/cmd/fossil/dat.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cmd/fossil/dat.h b/src/cmd/fossil/dat.h index 9c9a5707..d01dedb6 100644 --- a/src/cmd/fossil/dat.h +++ b/src/cmd/fossil/dat.h @@ -37,7 +37,6 @@ enum { Nowaitlock, Waitlock, - NilBlock = (~0UL), MaxBlock = (1UL<<31), }; @@ -79,7 +78,7 @@ struct Fs { int mode; /* immutable */ int noatimeupd; /* immutable */ int blockSize; /* immutable */ - VtSession *z; /* immutable */ + VtConn *z; /* immutable */ Snap *snap; /* immutable */ /* immutable; copy here & Fsys to ease error reporting */ char *name; @@ -94,7 +93,7 @@ struct Fs { * Deletion and creation of snapshots occurs under a write lock of elk, * ensuring no file operations are occurring concurrently. */ - VtLock *elk; /* epoch lock */ + RWLock elk; /* epoch lock */ u32int ehi; /* epoch high */ u32int elo; /* epoch low */ @@ -136,7 +135,7 @@ struct Source { Source *parent; /* immutable */ File *file; /* immutable; point back */ - VtLock *lk; + QLock lk; int ref; /* * epoch for the source @@ -233,7 +232,7 @@ struct Block { int nlock; uintptr pc; /* pc that fetched this block from the cache */ - VtLock *lk; + QLock lk; int part; u32int addr; @@ -261,7 +260,7 @@ struct Block { Block *ionext; int iostate; - VtRendez *ioready; + Rendez ioready; }; /* tree walker, for gc and archiver */ |