aboutsummaryrefslogtreecommitdiff
path: root/src/include/storage/lock.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/storage/lock.h')
-rw-r--r--src/include/storage/lock.h26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 1c0204132ce..5e9fb8b42f2 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: lock.h,v 1.36 2000/01/26 05:58:33 momjian Exp $
+ * $Id: lock.h,v 1.37 2000/04/12 17:16:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@ typedef int LOCKMASK;
* See LockShmemSize() in lock.c.
*
* NLOCKS_PER_XACT - The number of unique locks acquired in a transaction
- * (should be configurable!)
+ * (should be configurable!)
* NLOCKENTS - The maximum number of lock entries in the lock table.
* ----------------------
*/
@@ -62,19 +62,21 @@ typedef int LOCKMETHOD;
typedef struct LTAG
{
- Oid relId;
- Oid dbId;
+ Oid relId;
+ Oid dbId;
union
{
- BlockNumber blkno;
- TransactionId xid;
- } objId;
- /*
- * offnum should be part of objId.tupleId above, but would increase
- * sizeof(LOCKTAG) and so moved here; currently used by userlocks only.
+ BlockNumber blkno;
+ TransactionId xid;
+ } objId;
+
+ /*
+ * offnum should be part of objId.tupleId above, but would increase
+ * sizeof(LOCKTAG) and so moved here; currently used by userlocks
+ * only.
*/
- OffsetNumber offnum;
- uint16 lockmethod; /* needed by userlocks */
+ OffsetNumber offnum;
+ uint16 lockmethod; /* needed by userlocks */
} LOCKTAG;
#define TAGSIZE (sizeof(LOCKTAG))