Skip to content

Commit

Permalink
xfs: convert directory vector functions to constants
Browse files Browse the repository at this point in the history
Many of the vectorised function calls now take no parameters and
return a constant value. There is no reason for these to be vectored
functions, so convert them to constants

Binary sizes:

   text    data     bss     dec     hex filename
 794490   96802    1096  892388   d9de4 fs/xfs/xfs.o.orig
 792986   96802    1096  890884   d9804 fs/xfs/xfs.o.p1
 792350   96802    1096  890248   d9588 fs/xfs/xfs.o.p2
 789293   96802    1096  887191   d8997 fs/xfs/xfs.o.p3
 789005   96802    1096  886903   d8997 fs/xfs/xfs.o.p4
 789061   96802    1096  886959   d88af fs/xfs/xfs.o.p5
 789733   96802    1096  887631   d8b4f fs/xfs/xfs.o.p6
 791421   96802    1096  889319   d91e7 fs/xfs/xfs.o.p7
 791701   96802    1096  889599   d92ff fs/xfs/xfs.o.p8
 791205   96802    1096  889103   d91cf fs/xfs/xfs.o.p9

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
  • Loading branch information
Dave Chinner authored and Ben Myers committed Oct 30, 2013
1 parent 24dd0f5 commit 1c9a5b2
Show file tree
Hide file tree
Showing 10 changed files with 112 additions and 176 deletions.
14 changes: 6 additions & 8 deletions fs/xfs/xfs_da_btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,7 @@ xfs_da3_node_create(

dp->d_ops->node_hdr_to_disk(node, &ichdr);
xfs_trans_log_buf(tp, bp,
XFS_DA_LOGRANGE(node, &node->hdr,
dp->d_ops->node_hdr_size()));
XFS_DA_LOGRANGE(node, &node->hdr, dp->d_ops->node_hdr_size));

*bpp = bp;
return(0);
Expand Down Expand Up @@ -838,13 +837,12 @@ xfs_da3_node_rebalance(
*/
dp->d_ops->node_hdr_to_disk(node1, &nodehdr1);
xfs_trans_log_buf(tp, blk1->bp,
XFS_DA_LOGRANGE(node1, &node1->hdr,
dp->d_ops->node_hdr_size()));
XFS_DA_LOGRANGE(node1, &node1->hdr, dp->d_ops->node_hdr_size));

dp->d_ops->node_hdr_to_disk(node2, &nodehdr2);
xfs_trans_log_buf(tp, blk2->bp,
XFS_DA_LOGRANGE(node2, &node2->hdr,
dp->d_ops->node_hdr_size() +
dp->d_ops->node_hdr_size +
(sizeof(btree2[0]) * nodehdr2.count)));

/*
Expand Down Expand Up @@ -915,7 +913,7 @@ xfs_da3_node_add(
nodehdr.count += 1;
dp->d_ops->node_hdr_to_disk(node, &nodehdr);
xfs_trans_log_buf(state->args->trans, oldblk->bp,
XFS_DA_LOGRANGE(node, &node->hdr, dp->d_ops->node_hdr_size()));
XFS_DA_LOGRANGE(node, &node->hdr, dp->d_ops->node_hdr_size));

/*
* Copy the last hash value from the oldblk to propagate upwards.
Expand Down Expand Up @@ -1350,7 +1348,7 @@ xfs_da3_node_remove(
nodehdr.count -= 1;
dp->d_ops->node_hdr_to_disk(node, &nodehdr);
xfs_trans_log_buf(state->args->trans, drop_blk->bp,
XFS_DA_LOGRANGE(node, &node->hdr, dp->d_ops->node_hdr_size()));
XFS_DA_LOGRANGE(node, &node->hdr, dp->d_ops->node_hdr_size));

/*
* Copy the last hash value from the block to propagate upwards.
Expand Down Expand Up @@ -1423,7 +1421,7 @@ xfs_da3_node_unbalance(
dp->d_ops->node_hdr_to_disk(save_node, &save_hdr);
xfs_trans_log_buf(tp, save_blk->bp,
XFS_DA_LOGRANGE(save_node, &save_node->hdr,
dp->d_ops->node_hdr_size()));
dp->d_ops->node_hdr_size));

/*
* Save the last hashval in the remaining block for upward propagation.
Expand Down
Loading

0 comments on commit 1c9a5b2

Please sign in to comment.