diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 10:40:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 10:40:53 -0400 |
| commit | bfab08c097df5f6a60dd07f0f8c78c54e725780b (patch) | |
| tree | a93536a2bbcb2331e47d72dd182bb4c4d27b6d8b /fs/jfs/jfs_txnmgr.h | |
| parent | eb0e0076878a4f9e8e6e7e524ded0d6f7d4a6130 (diff) | |
| parent | 438282d85de2c8f8c5183fdf55140e51a0b18670 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'fs/jfs/jfs_txnmgr.h')
| -rw-r--r-- | fs/jfs/jfs_txnmgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/jfs_txnmgr.h b/fs/jfs/jfs_txnmgr.h index 59ad0f6b7231..0e4dc4514c47 100644 --- a/fs/jfs/jfs_txnmgr.h +++ b/fs/jfs/jfs_txnmgr.h | |||
| @@ -122,6 +122,7 @@ extern struct tlock *TxLock; /* transaction lock table */ | |||
| 122 | #define tlckLOG 0x0800 | 122 | #define tlckLOG 0x0800 |
| 123 | /* updateMap state */ | 123 | /* updateMap state */ |
| 124 | #define tlckUPDATEMAP 0x0080 | 124 | #define tlckUPDATEMAP 0x0080 |
| 125 | #define tlckDIRECTORY 0x0040 | ||
| 125 | /* freeLock state */ | 126 | /* freeLock state */ |
| 126 | #define tlckFREELOCK 0x0008 | 127 | #define tlckFREELOCK 0x0008 |
| 127 | #define tlckWRITEPAGE 0x0004 | 128 | #define tlckWRITEPAGE 0x0004 |