diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /fs/jfs/jfs_txnmgr.h | |
| parent | 17e5ad6c0ce5a970e2830d0de8bdd60a2f077d38 (diff) | |
| parent | ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 (diff) | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
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 59ad0f6b723..0e4dc4514c4 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 |