diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_log.c | 7 | ||||
-rw-r--r-- | fs/xfs/xfs_log.h | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_log_priv.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_types.h | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 1efb303d3aaf..19d0c5f73e24 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
@@ -3312,6 +3312,13 @@ xfs_log_ticket_get( | |||
3312 | return ticket; | 3312 | return ticket; |
3313 | } | 3313 | } |
3314 | 3314 | ||
3315 | xlog_tid_t | ||
3316 | xfs_log_get_trans_ident( | ||
3317 | struct xfs_trans *tp) | ||
3318 | { | ||
3319 | return tp->t_ticket->t_tid; | ||
3320 | } | ||
3321 | |||
3315 | /* | 3322 | /* |
3316 | * Allocate and initialise a new log ticket. | 3323 | * Allocate and initialise a new log ticket. |
3317 | */ | 3324 | */ |
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index 229d1f36ba9a..05f205aac913 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h | |||
@@ -19,7 +19,6 @@ | |||
19 | #define __XFS_LOG_H__ | 19 | #define __XFS_LOG_H__ |
20 | 20 | ||
21 | /* get lsn fields */ | 21 | /* get lsn fields */ |
22 | |||
23 | #define CYCLE_LSN(lsn) ((uint)((lsn)>>32)) | 22 | #define CYCLE_LSN(lsn) ((uint)((lsn)>>32)) |
24 | #define BLOCK_LSN(lsn) ((uint)(lsn)) | 23 | #define BLOCK_LSN(lsn) ((uint)(lsn)) |
25 | 24 | ||
@@ -134,6 +133,7 @@ struct xlog_in_core; | |||
134 | struct xlog_ticket; | 133 | struct xlog_ticket; |
135 | struct xfs_log_item; | 134 | struct xfs_log_item; |
136 | struct xfs_item_ops; | 135 | struct xfs_item_ops; |
136 | struct xfs_trans; | ||
137 | 137 | ||
138 | void xfs_log_item_init(struct xfs_mount *mp, | 138 | void xfs_log_item_init(struct xfs_mount *mp, |
139 | struct xfs_log_item *item, | 139 | struct xfs_log_item *item, |
@@ -190,6 +190,8 @@ void xlog_iodone(struct xfs_buf *); | |||
190 | struct xlog_ticket * xfs_log_ticket_get(struct xlog_ticket *ticket); | 190 | struct xlog_ticket * xfs_log_ticket_get(struct xlog_ticket *ticket); |
191 | void xfs_log_ticket_put(struct xlog_ticket *ticket); | 191 | void xfs_log_ticket_put(struct xlog_ticket *ticket); |
192 | 192 | ||
193 | xlog_tid_t xfs_log_get_trans_ident(struct xfs_trans *tp); | ||
194 | |||
193 | #endif | 195 | #endif |
194 | 196 | ||
195 | 197 | ||
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 9cf695154451..ac97bddcadba 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
@@ -152,8 +152,6 @@ static inline uint xlog_get_client_id(__be32 i) | |||
152 | #define XLOG_RECOVERY_NEEDED 0x4 /* log was recovered */ | 152 | #define XLOG_RECOVERY_NEEDED 0x4 /* log was recovered */ |
153 | #define XLOG_IO_ERROR 0x8 /* log hit an I/O error, and being | 153 | #define XLOG_IO_ERROR 0x8 /* log hit an I/O error, and being |
154 | shutdown */ | 154 | shutdown */ |
155 | typedef __uint32_t xlog_tid_t; | ||
156 | |||
157 | 155 | ||
158 | #ifdef __KERNEL__ | 156 | #ifdef __KERNEL__ |
159 | /* | 157 | /* |
diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h index b09904555d07..320775295e32 100644 --- a/fs/xfs/xfs_types.h +++ b/fs/xfs/xfs_types.h | |||
@@ -75,6 +75,8 @@ typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */ | |||
75 | 75 | ||
76 | typedef __uint16_t xfs_prid_t; /* prid_t truncated to 16bits in XFS */ | 76 | typedef __uint16_t xfs_prid_t; /* prid_t truncated to 16bits in XFS */ |
77 | 77 | ||
78 | typedef __uint32_t xlog_tid_t; /* transaction ID type */ | ||
79 | |||
78 | /* | 80 | /* |
79 | * These types are 64 bits on disk but are either 32 or 64 bits in memory. | 81 | * These types are 64 bits on disk but are either 32 or 64 bits in memory. |
80 | * Disk based types: | 82 | * Disk based types: |