summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_da_format.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2014-06-06 15:04:41 +1000
committerDave Chinner <david@fromorbit.com>2014-06-06 15:04:41 +1000
commit8c44a28561625d36591cc1540eb5f9033a9d1815 (patch)
tree4bf831c715077399594467d874d7320f6730407b /fs/xfs/xfs_da_format.c
parent892e3f342f9888066f1ce56f3683572f0ca9b8e9 (diff)
downloadlwn-8c44a28561625d36591cc1540eb5f9033a9d1815.tar.gz
lwn-8c44a28561625d36591cc1540eb5f9033a9d1815.zip
xfs: kill XFS_DIR2...FIRSTDB macros
They are just simple wrappers around xfs_dir2_byte_to_db(), and we've already removed one usage earlier in the patch set. Kill the rest before we start removing the xfs_mount from conversion functions. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_da_format.c')
-rw-r--r--fs/xfs/xfs_da_format.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_da_format.c b/fs/xfs/xfs_da_format.c
index f4a783b0359c..a2d0682fa309 100644
--- a/fs/xfs/xfs_da_format.c
+++ b/fs/xfs/xfs_da_format.c
@@ -611,7 +611,8 @@ xfs_dir2_free_bests_p(struct xfs_dir2_free *free)
static xfs_dir2_db_t
xfs_dir2_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db)
{
- return XFS_DIR2_FREE_FIRSTDB(mp) + db / xfs_dir2_free_max_bests(mp);
+ return xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) +
+ (db / xfs_dir2_free_max_bests(mp));
}
/*
@@ -642,7 +643,8 @@ xfs_dir3_free_bests_p(struct xfs_dir2_free *free)
static xfs_dir2_db_t
xfs_dir3_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db)
{
- return XFS_DIR2_FREE_FIRSTDB(mp) + db / xfs_dir3_free_max_bests(mp);
+ return xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) +
+ (db / xfs_dir3_free_max_bests(mp));
}
/*