diff options
| author | Christoph Hellwig <hch@infradead.org> | 2012-07-03 12:21:22 -0400 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-07-22 10:46:56 -0500 |
| commit | 475ee413f34165f8e6fcd7fbff3a4da1dce48c99 (patch) | |
| tree | a32dadb75dbbddf45fdd989ad8f44dd0ed466368 /fs/xfs/xfs_sync.c | |
| parent | 6b7a03f03a2f8b1629133e35729eba4727fae3cc (diff) | |
| download | lwn-475ee413f34165f8e6fcd7fbff3a4da1dce48c99.tar.gz lwn-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_sync.c')
| -rw-r--r-- | fs/xfs/xfs_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_sync.c b/fs/xfs/xfs_sync.c index 1e9ee064dbb2..e61fc1519073 100644 --- a/fs/xfs/xfs_sync.c +++ b/fs/xfs/xfs_sync.c @@ -712,8 +712,8 @@ restart: * Note that xfs_iflush will never block on the inode buffer lock, as * xfs_ifree_cluster() can lock the inode buffer before it locks the * ip->i_lock, and we are doing the exact opposite here. As a result, - * doing a blocking xfs_itobp() to get the cluster buffer would result - * in an ABBA deadlock with xfs_ifree_cluster(). + * doing a blocking xfs_imap_to_bp() to get the cluster buffer would + * result in an ABBA deadlock with xfs_ifree_cluster(). * * As xfs_ifree_cluser() must gather all inodes that are active in the * cache to mark them stale, if we hit this case we don't actually want |