- 11 Nov, 2019 40 commits
-
-
Christoph Hellwig authored
Replace the ->data_entry_tag_p dir ops method with a directly called xfs_dir2_data_entry_tag_p helper that takes care of the differences between the directory format with and without the file type field. Signed-off-by:
Christoph Hellwig <hch@lst.de> Reviewed-by:
Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by:
-
Christoph Hellwig authored
Replace the ->data_entsize dir ops method with a directly called xfs_dir2_data_entsize helper that takes care of the differences between the directory format with and without the file type field. Signed-off-by:
-
Christoph Hellwig authored
All the callers really want an offset into the buffer, so adopt the helper to return that instead. Signed-off-by:
-
Christoph Hellwig authored
Now that all users use the data_entry_offset field this method is unused and can be removed. Signed-off-by:
-
Christoph Hellwig authored
Use an offset as the main means for iteration, and only do pointer arithmetics to find the data/unused entries. Signed-off-by:
-
Christoph Hellwig authored
Use an offset as the main means for iteration, and only do pointer arithmetics to find the data/unused entries. Signed-off-by:
-
Christoph Hellwig authored
Use an offset as the main means for iteration, and only do pointer arithmetics to find the data/unused entries. Signed-off-by:
-
Christoph Hellwig authored
Use an offset as the main means for iteration, and only do pointer arithmetics to find the data/unused entries. Signed-off-by:
-
Christoph Hellwig authored
Use an offset as the main means for iteration, and only do pointer arithmetics to find the data/unused entries. Signed-off-by:
-
Christoph Hellwig authored
Use an offset as the main means for iteration, and only do pointer arithmetics to find the data/unused entries. Signed-off-by:
-
Christoph Hellwig authored
Use an offset as the main means for iteration, and only do pointer arithmetics to find the data/unused entries. Signed-off-by:
-
Christoph Hellwig authored
Replace the two users of the ->data_unused_p dir ops method with a direct calculation using ->data_entry_offset, and clean them up a bit. xfs_dir2_sf_to_block already had an offset variable containing the value of ->data_entry_offset, which we are now reusing to make it clear that the initial freespace entry is at the same place that we later fill in the 1 entry, and in xfs_dir3_data_init the function is cleaned up a bit to keep the initialization of fields of a given structure close to each other, and to avoid a local variable. Signed-off-by:
-
Christoph Hellwig authored
The only user of the ->data_dot_entry_p and ->data_dotdot_entry_p methods is the xfs_dir2_sf_to_block function that builds block format directorys from a short form directory. It already uses pointer arithmetics with a offset variable to do so for the real entries in the directory, so switch the generation of the . and .. entries to the same scheme, and clean up some of the later pointer arithmetics to use bp->b_addr directly as well and avoid some casts. Signed-off-by:
-
Christoph Hellwig authored
The data_dotdot_offset value is always equal to data_entry_offset plus the fixed size of the "." entry. Right now calculating that fixed size requires an indirect call, but by the end of this series it will be an inline function that can be constant folded. Signed-off-by:
-
Christoph Hellwig authored
The data_dot_offset value is always equal to data_entry_offset given that "." is always the first entry in the directory. Signed-off-by:
-
Christoph Hellwig authored
Signed-off-by:
-
Christoph Hellwig authored
Replace the ->sf_get_ftype and ->sf_put_ftype dir ops methods with directly called xfs_dir2_sf_get_ftype and xfs_dir2_sf_put_ftype helpers that takes care of the differences between the directory format with and without the file type field. Signed-off-by:
-
Christoph Hellwig authored
Replace the ->sf_get_ino and ->sf_put_ino dir ops methods with directly called xfs_dir2_sf_get_ino and xfs_dir2_sf_put_ino helpers that take care of the difference between the directory format with and without the file type field. Also move xfs_dir2_sf_get_parent_ino and xfs_dir2_sf_put_parent_ino to xfs_dir2_sf.c with the rest of the low-level short form entry handling and use XFS_MAXINUMBER istead of opencoded constants. Signed-off-by:
-
Christoph Hellwig authored
Just check for file-type enabled directories directly. Signed-off-by:
-
Christoph Hellwig authored
The parent inode handling is the same for all directory format variants, just use direct calls instead of going through a pointless indirect call. Signed-off-by:
-
Christoph Hellwig authored
Now that the max bests value is in struct xfs_da_geometry both instances of ->db_to_fdb and ->db_to_fdindex are identical. Replace them with local xfs_dir2_db_to_fdb and xfs_dir2_db_to_fdindex functions in xfs_dir2_node.c. Signed-off-by:
-
Christoph Hellwig authored
Move the max free bests count towards our structure for dir/attr geometry parameters. Signed-off-by:
-
Christoph Hellwig authored
Move the free header size towards our structure for dir/attr geometry parameters. Signed-off-by:
-
Christoph Hellwig authored
All but two callers of the ->free_bests_p dir operation already have a struct xfs_dir3_icfree_hdr from a previous call to xfs_dir2_free_hdr_from_disk at hand. Add a pointer to the bests to struct xfs_dir3_icfree_hdr to clean up this pattern. To optimize this pattern, pass the struct xfs_dir3_icfree_hdr to xfs_dir2_free_log_bests instead of recalculating the pointer there. Signed-off-by:
-
Christoph Hellwig authored
Return the xfs_dir3_icfree_hdr used by the helpers called from xfs_dir2_node_addname_int to the main function to prepare for the next round of changes where we'll use the ichdr in xfs_dir3_icfree_hdr to avoid extra operations to find the bests pointers. Signed-off-by:
-
Christoph Hellwig authored
Replace the ->free_hdr_to_disk dir ops method with a directly called xfs_dir2_free_hdr_to_disk helper that takes care of the differences between the v4 and v5 on-disk format. Signed-off-by:
-
Christoph Hellwig authored
Replace the ->free_hdr_from_disk dir ops method with a directly called xfs_dir_free_hdr_from_disk helper that takes care of the differences between the v4 and v5 on-disk format. Signed-off-by:
-
Christoph Hellwig authored
Move the max leaf entries count towards our structure for dir/attr geometry parameters. Signed-off-by:
-
Christoph Hellwig authored
Move the leaf header size towards our structure for dir/attr geometry parameters. Signed-off-by:
-
Christoph Hellwig authored
All callers of the ->node_tree_p dir operation already have a struct xfs_dir3_icleaf_hdr from a previous call to xfs_da_leaf_hdr_from_disk at hand, or just need slight changes to the calling conventions to do so. Add a pointer to the entries to struct xfs_dir3_icleaf_hdr to clean up this pattern. To make this possible the xfs_dir3_leaf_log_ents function grow a new argument to pass the xfs_dir3_icleaf_hdr that call callers already have, and xfs_dir2_leaf_lookup_int returns the xfs_dir3_icleaf_hdr to the callers so that they can later use it. Signed-off-by:
-
Christoph Hellwig authored
Replace the ->leaf_hdr_to_disk dir ops method with a directly called xfs_dir_leaf_hdr_to_disk helper that takes care of the differences between the v4 and v5 on-disk format. Signed-off-by:
-
Christoph Hellwig authored
Replace the ->leaf_hdr_from_disk dir ops method with a directly called xfs_dir2_leaf_hdr_from_disk helper that takes care of the differences between the v4 and v5 on-disk format. Signed-off-by:
-
Christoph Hellwig authored
Move the node header size field to struct xfs_da_geometry, and remove the now unused non-directory dir ops infrastructure. Signed-off-by:
-
Christoph Hellwig authored
All but two callers of the ->node_tree_p dir operation already have a xfs_da3_icnode_hdr from a previous call to xfs_da3_node_hdr_from_disk at hand. Add a pointer to the btree entries to struct xfs_da3_icnode_hdr to clean up this pattern. The two remaining callers now expand the whole header as well, but that isn't very expensive and not in a super hot path anyway. Signed-off-by:
-
Christoph Hellwig authored
Replace the ->node_hdr_to_disk dir ops method with a directly called xfs_da_node_hdr_to_disk helper that takes care of the v4 vs v5 difference. Signed-off-by:
-
Christoph Hellwig authored
Replace the ->node_hdr_from_disk dir ops method with a directly called xfs_da_node_hdr_from_disk helper that takes care of the v4 vs v5 difference. Signed-off-by:
-
Christoph Hellwig authored
Break up xchk_da_btree_entry and handle looking up leaf node entries in the attr / dir callbacks, so that only the generic node handling is left in the common core code. Note that the checks for the crc enabled blocks are removed, as the scrubbing code already remaps the magic numbers earlier. Signed-off-by:
-
Christoph Hellwig authored
None of these can ever be negative, so use unsigned types. Signed-off-by:
-
Christoph Hellwig authored
Move the abstract in-memory version of various btree block headers out of xfs_da_format.h as they aren't on-disk formats. Signed-off-by:
-
Dan Carpenter authored
The extra tab makes the code slightly confusing. Signed-off-by:
Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by:
Ian Kent <raven@themaw.net> Reviewed-by:
-
