summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_recover.c
diff options
context:
space:
mode:
authorChristoph Hellwig2012-07-03 18:21:22 +0200
committerBen Myers2012-07-22 17:46:56 +0200
commit475ee413f34165f8e6fcd7fbff3a4da1dce48c99 (patch)
treea32dadb75dbbddf45fdd989ad8f44dd0ed466368 /fs/xfs/xfs_log_recover.c
parentxfs: handle EOF correctly in xfs_vm_writepage (diff)
downloadkernel-qcow2-linux-475ee413f34165f8e6fcd7fbff3a4da1dce48c99.tar.gz
kernel-qcow2-linux-475ee413f34165f8e6fcd7fbff3a4da1dce48c99.tar.xz
kernel-qcow2-linux-475ee413f34165f8e6fcd7fbff3a4da1dce48c99.zip
xfs: merge xfs_itobp into xfs_imap_to_bp
All callers of xfs_imap_to_bp want the dinode pointer, so let's calculate it inside xfs_imap_to_bp. Once that is done xfs_itobp becomes a fairly pointless wrapper which can be replaced with direct calls to xfs_imap_to_bp. Signed-off-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index a76ba886e738..5da3ace352bf 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3106,7 +3106,7 @@ xlog_recover_process_one_iunlink(
/*
* Get the on disk inode to find the next inode in the bucket.
*/
- error = xfs_itobp(mp, NULL, ip, &dip, &ibp, 0);
+ error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &ibp, 0, 0);
if (error)
goto fail_iput;