diff options
| author | Alex Elder <aelder@sgi.com> | 2010-03-05 12:45:03 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-03-05 12:45:03 -0500 |
| commit | 9b1f56d60acfd634728f91f34922066c6f80ede6 (patch) | |
| tree | e8f64d4bea808341f56f41e724c2920ae6b1ed26 /fs/xfs/xfs_trans.h | |
| parent | 64ba9926759792cf7b95f823402e2781edd1b5d4 (diff) | |
| parent | 07000ee686cf19e853fa06f7904eff2cfe230ea3 (diff) | |
Merge branch 'for-2.6.34-rc1-batch2' into for-linus
Diffstat (limited to 'fs/xfs/xfs_trans.h')
| -rw-r--r-- | fs/xfs/xfs_trans.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index c93e3a102857..79c8bab9dfff 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h | |||
| @@ -910,7 +910,7 @@ typedef struct xfs_trans { | |||
| 910 | unsigned int t_blk_res_used; /* # of resvd blocks used */ | 910 | unsigned int t_blk_res_used; /* # of resvd blocks used */ |
| 911 | unsigned int t_rtx_res; /* # of rt extents resvd */ | 911 | unsigned int t_rtx_res; /* # of rt extents resvd */ |
| 912 | unsigned int t_rtx_res_used; /* # of resvd rt extents used */ | 912 | unsigned int t_rtx_res_used; /* # of resvd rt extents used */ |
| 913 | xfs_log_ticket_t t_ticket; /* log mgr ticket */ | 913 | struct xlog_ticket *t_ticket; /* log mgr ticket */ |
| 914 | xfs_lsn_t t_lsn; /* log seq num of start of | 914 | xfs_lsn_t t_lsn; /* log seq num of start of |
| 915 | * transaction. */ | 915 | * transaction. */ |
| 916 | xfs_lsn_t t_commit_lsn; /* log seq num of end of | 916 | xfs_lsn_t t_commit_lsn; /* log seq num of end of |