aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_recover.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2012-04-23 01:58:54 -0400
committerBen Myers <bpm@sgi.com>2012-05-14 17:20:50 -0400
commita8acad70731e7d0585f25f33f8a009176f001f70 (patch)
tree07a14f8bde89e7947f56df7203530b7713b186ac /fs/xfs/xfs_log_recover.c
parent795cac72e902496adac399389f9affe5d1ab821a (diff)
xfs: kill XBF_LOCK
Buffers are always returned locked from the lookup routines. Hence we don't need to tell the lookup routines to return locked buffers, on to try and lock them. Remove XBF_LOCK from all the callers and from internal buffer cache usage. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
-rw-r--r--fs/xfs/xfs_log_recover.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 8c826b00aac1..0d9bdb6bace4 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2131,7 +2131,7 @@ xlog_recover_buffer_pass2(
2131 2131
2132 trace_xfs_log_recover_buf_recover(log, buf_f); 2132 trace_xfs_log_recover_buf_recover(log, buf_f);
2133 2133
2134 buf_flags = XBF_LOCK; 2134 buf_flags = 0;
2135 if (!(buf_f->blf_flags & XFS_BLF_INODE_BUF)) 2135 if (!(buf_f->blf_flags & XFS_BLF_INODE_BUF))
2136 buf_flags |= XBF_MAPPED; 2136 buf_flags |= XBF_MAPPED;
2137 2137
@@ -2229,8 +2229,7 @@ xlog_recover_inode_pass2(
2229 } 2229 }
2230 trace_xfs_log_recover_inode_recover(log, in_f); 2230 trace_xfs_log_recover_inode_recover(log, in_f);
2231 2231
2232 bp = xfs_buf_read(mp->m_ddev_targp, in_f->ilf_blkno, in_f->ilf_len, 2232 bp = xfs_buf_read(mp->m_ddev_targp, in_f->ilf_blkno, in_f->ilf_len, 0);
2233 XBF_LOCK);
2234 if (!bp) { 2233 if (!bp) {
2235 error = ENOMEM; 2234 error = ENOMEM;
2236 goto error; 2235 goto error;
@@ -3103,7 +3102,7 @@ xlog_recover_process_one_iunlink(
3103 /* 3102 /*
3104 * Get the on disk inode to find the next inode in the bucket. 3103 * Get the on disk inode to find the next inode in the bucket.
3105 */ 3104 */
3106 error = xfs_itobp(mp, NULL, ip, &dip, &ibp, XBF_LOCK); 3105 error = xfs_itobp(mp, NULL, ip, &dip, &ibp, 0);
3107 if (error) 3106 if (error)
3108 goto fail_iput; 3107 goto fail_iput;
3109 3108