diff options
author | Dave Chinner <dchinner@redhat.com> | 2014-06-06 01:04:41 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-06-06 01:04:41 -0400 |
commit | 8c44a28561625d36591cc1540eb5f9033a9d1815 (patch) | |
tree | 4bf831c715077399594467d874d7320f6730407b /fs/xfs | |
parent | 892e3f342f9888066f1ce56f3683572f0ca9b8e9 (diff) |
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')
-rw-r--r-- | fs/xfs/xfs_da_format.c | 6 | ||||
-rw-r--r-- | fs/xfs/xfs_da_format.h | 6 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_leaf.c | 9 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_node.c | 11 |
5 files changed, 17 insertions, 17 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) | |||
611 | static xfs_dir2_db_t | 611 | static xfs_dir2_db_t |
612 | xfs_dir2_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db) | 612 | xfs_dir2_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db) |
613 | { | 613 | { |
614 | return XFS_DIR2_FREE_FIRSTDB(mp) + db / xfs_dir2_free_max_bests(mp); | 614 | return xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) + |
615 | (db / xfs_dir2_free_max_bests(mp)); | ||
615 | } | 616 | } |
616 | 617 | ||
617 | /* | 618 | /* |
@@ -642,7 +643,8 @@ xfs_dir3_free_bests_p(struct xfs_dir2_free *free) | |||
642 | static xfs_dir2_db_t | 643 | static xfs_dir2_db_t |
643 | xfs_dir3_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db) | 644 | xfs_dir3_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db) |
644 | { | 645 | { |
645 | return XFS_DIR2_FREE_FIRSTDB(mp) + db / xfs_dir3_free_max_bests(mp); | 646 | return xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) + |
647 | (db / xfs_dir3_free_max_bests(mp)); | ||
646 | } | 648 | } |
647 | 649 | ||
648 | /* | 650 | /* |
diff --git a/fs/xfs/xfs_da_format.h b/fs/xfs/xfs_da_format.h index 32b415ce7798..44d7fac4ca64 100644 --- a/fs/xfs/xfs_da_format.h +++ b/fs/xfs/xfs_da_format.h | |||
@@ -330,8 +330,6 @@ xfs_dir2_sf_firstentry(struct xfs_dir2_sf_hdr *hdr) | |||
330 | #define XFS_DIR2_SPACE_SIZE (1ULL << (32 + XFS_DIR2_DATA_ALIGN_LOG)) | 330 | #define XFS_DIR2_SPACE_SIZE (1ULL << (32 + XFS_DIR2_DATA_ALIGN_LOG)) |
331 | #define XFS_DIR2_DATA_SPACE 0 | 331 | #define XFS_DIR2_DATA_SPACE 0 |
332 | #define XFS_DIR2_DATA_OFFSET (XFS_DIR2_DATA_SPACE * XFS_DIR2_SPACE_SIZE) | 332 | #define XFS_DIR2_DATA_OFFSET (XFS_DIR2_DATA_SPACE * XFS_DIR2_SPACE_SIZE) |
333 | #define XFS_DIR2_DATA_FIRSTDB(mp) \ | ||
334 | xfs_dir2_byte_to_db(mp, XFS_DIR2_DATA_OFFSET) | ||
335 | 333 | ||
336 | /* | 334 | /* |
337 | * Describe a free area in the data block. | 335 | * Describe a free area in the data block. |
@@ -456,8 +454,6 @@ xfs_dir2_data_unused_tag_p(struct xfs_dir2_data_unused *dup) | |||
456 | */ | 454 | */ |
457 | #define XFS_DIR2_LEAF_SPACE 1 | 455 | #define XFS_DIR2_LEAF_SPACE 1 |
458 | #define XFS_DIR2_LEAF_OFFSET (XFS_DIR2_LEAF_SPACE * XFS_DIR2_SPACE_SIZE) | 456 | #define XFS_DIR2_LEAF_OFFSET (XFS_DIR2_LEAF_SPACE * XFS_DIR2_SPACE_SIZE) |
459 | #define XFS_DIR2_LEAF_FIRSTDB(mp) \ | ||
460 | xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET) | ||
461 | 457 | ||
462 | /* | 458 | /* |
463 | * Leaf block header. | 459 | * Leaf block header. |
@@ -531,8 +527,6 @@ xfs_dir2_leaf_bests_p(struct xfs_dir2_leaf_tail *ltp) | |||
531 | */ | 527 | */ |
532 | #define XFS_DIR2_FREE_SPACE 2 | 528 | #define XFS_DIR2_FREE_SPACE 2 |
533 | #define XFS_DIR2_FREE_OFFSET (XFS_DIR2_FREE_SPACE * XFS_DIR2_SPACE_SIZE) | 529 | #define XFS_DIR2_FREE_OFFSET (XFS_DIR2_FREE_SPACE * XFS_DIR2_SPACE_SIZE) |
534 | #define XFS_DIR2_FREE_FIRSTDB(mp) \ | ||
535 | xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) | ||
536 | 530 | ||
537 | typedef struct xfs_dir2_free_hdr { | 531 | typedef struct xfs_dir2_free_hdr { |
538 | __be32 magic; /* XFS_DIR2_FREE_MAGIC */ | 532 | __be32 magic; /* XFS_DIR2_FREE_MAGIC */ |
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c index bf0d6dd47242..08dfcd1e5e00 100644 --- a/fs/xfs/xfs_dir2.c +++ b/fs/xfs/xfs_dir2.c | |||
@@ -744,7 +744,7 @@ xfs_dir2_shrink_inode( | |||
744 | /* | 744 | /* |
745 | * If it's not a data block, we're done. | 745 | * If it's not a data block, we're done. |
746 | */ | 746 | */ |
747 | if (db >= XFS_DIR2_LEAF_FIRSTDB(mp)) | 747 | if (db >= xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET)) |
748 | return 0; | 748 | return 0; |
749 | /* | 749 | /* |
750 | * If the block isn't the last one in the directory, we're done. | 750 | * If the block isn't the last one in the directory, we're done. |
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c index f571723e2378..dc4ef19365b8 100644 --- a/fs/xfs/xfs_dir2_leaf.c +++ b/fs/xfs/xfs_dir2_leaf.c | |||
@@ -347,8 +347,8 @@ xfs_dir3_leaf_get_buf( | |||
347 | int error; | 347 | int error; |
348 | 348 | ||
349 | ASSERT(magic == XFS_DIR2_LEAF1_MAGIC || magic == XFS_DIR2_LEAFN_MAGIC); | 349 | ASSERT(magic == XFS_DIR2_LEAF1_MAGIC || magic == XFS_DIR2_LEAFN_MAGIC); |
350 | ASSERT(bno >= XFS_DIR2_LEAF_FIRSTDB(mp) && | 350 | ASSERT(bno >= xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET) && |
351 | bno < XFS_DIR2_FREE_FIRSTDB(mp)); | 351 | bno < xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET)); |
352 | 352 | ||
353 | error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(mp, bno), -1, &bp, | 353 | error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(mp, bno), -1, &bp, |
354 | XFS_DATA_FORK); | 354 | XFS_DATA_FORK); |
@@ -404,7 +404,7 @@ xfs_dir2_block_to_leaf( | |||
404 | return error; | 404 | return error; |
405 | } | 405 | } |
406 | ldb = xfs_dir2_da_to_db(mp, blkno); | 406 | ldb = xfs_dir2_da_to_db(mp, blkno); |
407 | ASSERT(ldb == XFS_DIR2_LEAF_FIRSTDB(mp)); | 407 | ASSERT(ldb == xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET)); |
408 | /* | 408 | /* |
409 | * Initialize the leaf block, get a buffer for it. | 409 | * Initialize the leaf block, get a buffer for it. |
410 | */ | 410 | */ |
@@ -1798,7 +1798,8 @@ xfs_dir2_node_to_leaf( | |||
1798 | /* | 1798 | /* |
1799 | * Get rid of the freespace block. | 1799 | * Get rid of the freespace block. |
1800 | */ | 1800 | */ |
1801 | error = xfs_dir2_shrink_inode(args, XFS_DIR2_FREE_FIRSTDB(mp), fbp); | 1801 | error = xfs_dir2_shrink_inode(args, |
1802 | xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET), fbp); | ||
1802 | if (error) { | 1803 | if (error) { |
1803 | /* | 1804 | /* |
1804 | * This can't fail here because it can only happen when | 1805 | * This can't fail here because it can only happen when |
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c index 9cb91ee0914b..1bcaaa0ffdbd 100644 --- a/fs/xfs/xfs_dir2_node.c +++ b/fs/xfs/xfs_dir2_node.c | |||
@@ -315,7 +315,7 @@ xfs_dir2_leaf_to_node( | |||
315 | if ((error = xfs_dir2_grow_inode(args, XFS_DIR2_FREE_SPACE, &fdb))) { | 315 | if ((error = xfs_dir2_grow_inode(args, XFS_DIR2_FREE_SPACE, &fdb))) { |
316 | return error; | 316 | return error; |
317 | } | 317 | } |
318 | ASSERT(fdb == XFS_DIR2_FREE_FIRSTDB(mp)); | 318 | ASSERT(fdb == xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET)); |
319 | /* | 319 | /* |
320 | * Get the buffer for the new freespace block. | 320 | * Get the buffer for the new freespace block. |
321 | */ | 321 | */ |
@@ -1256,7 +1256,7 @@ xfs_dir2_leafn_remove( | |||
1256 | struct xfs_dir3_icfree_hdr freehdr; | 1256 | struct xfs_dir3_icfree_hdr freehdr; |
1257 | dp->d_ops->free_hdr_from_disk(&freehdr, free); | 1257 | dp->d_ops->free_hdr_from_disk(&freehdr, free); |
1258 | ASSERT(freehdr.firstdb == dp->d_ops->free_max_bests(mp) * | 1258 | ASSERT(freehdr.firstdb == dp->d_ops->free_max_bests(mp) * |
1259 | (fdb - XFS_DIR2_FREE_FIRSTDB(mp))); | 1259 | (fdb - xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET))); |
1260 | } | 1260 | } |
1261 | #endif | 1261 | #endif |
1262 | /* | 1262 | /* |
@@ -1747,7 +1747,8 @@ xfs_dir2_node_addname_int( | |||
1747 | * us a freespace block to start with. | 1747 | * us a freespace block to start with. |
1748 | */ | 1748 | */ |
1749 | if (++fbno == 0) | 1749 | if (++fbno == 0) |
1750 | fbno = XFS_DIR2_FREE_FIRSTDB(mp); | 1750 | fbno = xfs_dir2_byte_to_db(mp, |
1751 | XFS_DIR2_FREE_OFFSET); | ||
1751 | /* | 1752 | /* |
1752 | * If it's ifbno we already looked at it. | 1753 | * If it's ifbno we already looked at it. |
1753 | */ | 1754 | */ |
@@ -1887,7 +1888,9 @@ xfs_dir2_node_addname_int( | |||
1887 | /* | 1888 | /* |
1888 | * Remember the first slot as our empty slot. | 1889 | * Remember the first slot as our empty slot. |
1889 | */ | 1890 | */ |
1890 | freehdr.firstdb = (fbno - XFS_DIR2_FREE_FIRSTDB(mp)) * | 1891 | freehdr.firstdb = |
1892 | (fbno - xfs_dir2_byte_to_db(mp, | ||
1893 | XFS_DIR2_FREE_OFFSET)) * | ||
1891 | dp->d_ops->free_max_bests(mp); | 1894 | dp->d_ops->free_max_bests(mp); |
1892 | } else { | 1895 | } else { |
1893 | free = fbp->b_addr; | 1896 | free = fbp->b_addr; |