diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-11 23:28:02 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-11 23:28:02 -0500 |
commit | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (patch) | |
tree | 2c6d2766054a925a42c1863e91fb5b8c6d0eb5cb /fs/xfs/xfs_inode.c | |
parent | cfbe52672fbc6f333892e8dde82c35e0a76aa5f5 (diff) | |
parent | c4cd747ee6c3ba1e7727878e3fce482d0d8c0136 (diff) |
Merge branch 'master' of git+ssh://git.melbourne.sgi.com/git/xfs
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 063da344e185..3adb868df183 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -870,7 +870,7 @@ xfs_iread( | |||
870 | * around for a while. This helps to keep recently accessed | 870 | * around for a while. This helps to keep recently accessed |
871 | * meta-data in-core longer. | 871 | * meta-data in-core longer. |
872 | */ | 872 | */ |
873 | XFS_BUF_SET_REF(bp, XFS_INO_REF); | 873 | XFS_BUF_SET_REF(bp, XFS_INO_REF); |
874 | 874 | ||
875 | /* | 875 | /* |
876 | * Use xfs_trans_brelse() to release the buffer containing the | 876 | * Use xfs_trans_brelse() to release the buffer containing the |
@@ -3232,8 +3232,6 @@ corrupt_out: | |||
3232 | 3232 | ||
3233 | 3233 | ||
3234 | #ifdef XFS_ILOCK_TRACE | 3234 | #ifdef XFS_ILOCK_TRACE |
3235 | ktrace_t *xfs_ilock_trace_buf; | ||
3236 | |||
3237 | void | 3235 | void |
3238 | xfs_ilock_trace(xfs_inode_t *ip, int lock, unsigned int lockflags, inst_t *ra) | 3236 | xfs_ilock_trace(xfs_inode_t *ip, int lock, unsigned int lockflags, inst_t *ra) |
3239 | { | 3237 | { |