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.c | |
| parent | 64ba9926759792cf7b95f823402e2781edd1b5d4 (diff) | |
| parent | 07000ee686cf19e853fa06f7904eff2cfe230ea3 (diff) | |
Merge branch 'for-2.6.34-rc1-batch2' into for-linus
Diffstat (limited to 'fs/xfs/xfs_trans.c')
| -rw-r--r-- | fs/xfs/xfs_trans.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index be942d4e3324..f73e358bae8d 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c | |||
| @@ -796,7 +796,7 @@ _xfs_trans_commit( | |||
| 796 | int sync; | 796 | int sync; |
| 797 | #define XFS_TRANS_LOGVEC_COUNT 16 | 797 | #define XFS_TRANS_LOGVEC_COUNT 16 |
| 798 | xfs_log_iovec_t log_vector_fast[XFS_TRANS_LOGVEC_COUNT]; | 798 | xfs_log_iovec_t log_vector_fast[XFS_TRANS_LOGVEC_COUNT]; |
| 799 | void *commit_iclog; | 799 | struct xlog_in_core *commit_iclog; |
| 800 | int shutdown; | 800 | int shutdown; |
| 801 | 801 | ||
| 802 | commit_lsn = -1; | 802 | commit_lsn = -1; |