Commit 30028030 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: convert directory db conversion to xfs_da_geometry 



Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 2998ab1d

fs/xfs/xfs_da_format.c

+2 −2
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ 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_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) +

	return xfs_dir2_byte_to_db(mp->m_dir_geo, XFS_DIR2_FREE_OFFSET) +

			(db / xfs_dir2_free_max_bests(mp));

}
@@ -643,7 +643,7 @@ 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_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) +

	return xfs_dir2_byte_to_db(mp->m_dir_geo, XFS_DIR2_FREE_OFFSET) +

			(db / xfs_dir3_free_max_bests(mp));

}

fs/xfs/xfs_dir2.c

+9 −4
Original line number Diff line number Diff line
@@ -117,9 +117,14 @@ xfs_da_mount( 
	dageo->fsblog = mp->m_sb.sb_blocklog;

	dageo->blksize = 1 << dageo->blklog;

	dageo->fsbcount = 1 << mp->m_sb.sb_dirblklog;

	dageo->datablk = xfs_dir2_byte_to_da(mp, XFS_DIR2_DATA_OFFSET);

	dageo->leafblk = xfs_dir2_byte_to_da(mp, XFS_DIR2_LEAF_OFFSET);

	dageo->freeblk = xfs_dir2_byte_to_da(mp, XFS_DIR2_FREE_OFFSET);



	/*

	 * Now we've set up the block conversion variables, we can calculate the

	 * segment block constants using the geometry structure.

	 */

	dageo->datablk = xfs_dir2_byte_to_da(dageo, XFS_DIR2_DATA_OFFSET);

	dageo->leafblk = xfs_dir2_byte_to_da(dageo, XFS_DIR2_LEAF_OFFSET);

	dageo->freeblk = xfs_dir2_byte_to_da(dageo, XFS_DIR2_FREE_OFFSET);

	dageo->node_ents = (dageo->blksize - nodehdr_size) /

				(uint)sizeof(xfs_da_node_entry_t);

	dageo->magicpct = (dageo->blksize * 37) / 100;
@@ -744,7 +749,7 @@ xfs_dir2_shrink_inode( 
	/*

	 * If it's not a data block, we're done.

	 */

	if (db >= xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET))

	if (db >= xfs_dir2_byte_to_db(args->geo, XFS_DIR2_LEAF_OFFSET))

		return 0;

	/*

	 * If the block isn't the last one in the directory, we're done.

fs/xfs/xfs_dir2_block.c

+9 −6
Original line number Diff line number Diff line
@@ -639,7 +639,8 @@ xfs_dir2_block_lookup( 
	 * Get the offset from the leaf entry, to point to the data.

	 */

	dep = (xfs_dir2_data_entry_t *)((char *)hdr +

		xfs_dir2_dataptr_to_off(mp, be32_to_cpu(blp[ent].address)));

			xfs_dir2_dataptr_to_off(args->geo,

						be32_to_cpu(blp[ent].address)));

	/*

	 * Fill in inode number, CI name if appropriate, release the block.

	 */
@@ -723,7 +724,7 @@ xfs_dir2_block_lookup_int( 
		 * Get pointer to the entry from the leaf.

		 */

		dep = (xfs_dir2_data_entry_t *)

			((char *)hdr + xfs_dir2_dataptr_to_off(mp, addr));

			((char *)hdr + xfs_dir2_dataptr_to_off(args->geo, addr));

		/*

		 * Compare name and if it's an exact match, return the index

		 * and buffer. If it's the first case-insensitive match, store
@@ -795,8 +796,9 @@ xfs_dir2_block_removename( 
	/*

	 * Point to the data entry using the leaf entry.

	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)hdr + xfs_dir2_dataptr_to_off(mp, be32_to_cpu(blp[ent].address)));

	dep = (xfs_dir2_data_entry_t *)((char *)hdr +

			xfs_dir2_dataptr_to_off(args->geo,

						be32_to_cpu(blp[ent].address)));

	/*

	 * Mark the data entry's space free.

	 */
@@ -870,8 +872,9 @@ xfs_dir2_block_replace( 
	/*

	 * Point to the data entry we need to change.

	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)hdr + xfs_dir2_dataptr_to_off(mp, be32_to_cpu(blp[ent].address)));

	dep = (xfs_dir2_data_entry_t *)((char *)hdr +

			xfs_dir2_dataptr_to_off(args->geo,

						be32_to_cpu(blp[ent].address)));

	ASSERT(be64_to_cpu(dep->inumber) != args->inumber);

	/*

	 * Change the inode number to the new value.

fs/xfs/xfs_dir2_data.c

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ __xfs_dir3_data_check( 
		lastfree = 0;

		if (hdr->magic == cpu_to_be32(XFS_DIR2_BLOCK_MAGIC) ||

		    hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC)) {

			addr = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,

			addr = xfs_dir2_db_off_to_dataptr(mp->m_dir_geo,

				mp->m_dirdatablk,

				(xfs_dir2_data_aoff_t)

				((char *)dep - (char *)hdr));

			name.name = dep->name;

fs/xfs/xfs_dir2_leaf.c

+17 −13
Original line number Diff line number Diff line
@@ -347,8 +347,8 @@ xfs_dir3_leaf_get_buf( 
	int			error;



	ASSERT(magic == XFS_DIR2_LEAF1_MAGIC || magic == XFS_DIR2_LEAFN_MAGIC);

	ASSERT(bno >= xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET) &&

	       bno < xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET));

	ASSERT(bno >= xfs_dir2_byte_to_db(args->geo, XFS_DIR2_LEAF_OFFSET) &&

	       bno < xfs_dir2_byte_to_db(args->geo, XFS_DIR2_FREE_OFFSET));



	error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(args->geo, bno),

			       -1, &bp, XFS_DATA_FORK);
@@ -404,7 +404,7 @@ xfs_dir2_block_to_leaf( 
		return error;

	}

	ldb = xfs_dir2_da_to_db(args->geo, blkno);

	ASSERT(ldb == xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET));

	ASSERT(ldb == xfs_dir2_byte_to_db(args->geo, XFS_DIR2_LEAF_OFFSET));

	/*

	 * Initialize the leaf block, get a buffer for it.

	 */
@@ -670,7 +670,7 @@ xfs_dir2_leaf_addname( 
	     index++, lep++) {

		if (be32_to_cpu(lep->address) == XFS_DIR2_NULL_DATAPTR)

			continue;

		i = xfs_dir2_dataptr_to_db(mp, be32_to_cpu(lep->address));

		i = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address));

		ASSERT(i < be32_to_cpu(ltp->bestcount));

		ASSERT(bestsp[i] != cpu_to_be16(NULLDATAOFF));

		if (be16_to_cpu(bestsp[i]) >= length) {
@@ -889,7 +889,8 @@ xfs_dir2_leaf_addname( 
	 * Fill in the new leaf entry.

	 */

	lep->hashval = cpu_to_be32(args->hashval);

	lep->address = cpu_to_be32(xfs_dir2_db_off_to_dataptr(mp, use_block,

	lep->address = cpu_to_be32(

				xfs_dir2_db_off_to_dataptr(args->geo, use_block,

				be16_to_cpu(*tagp)));

	/*

	 * Log the leaf fields and give up the buffers.
@@ -1185,7 +1186,7 @@ xfs_dir2_leaf_lookup( 
	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)dbp->b_addr +

	       xfs_dir2_dataptr_to_off(dp->i_mount, be32_to_cpu(lep->address)));

	       xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address)));

	/*

	 * Return the found inode number & CI name if appropriate

	 */
@@ -1260,7 +1261,8 @@ xfs_dir2_leaf_lookup_int( 
		/*

		 * Get the new data block number.

		 */

		newdb = xfs_dir2_dataptr_to_db(mp, be32_to_cpu(lep->address));

		newdb = xfs_dir2_dataptr_to_db(args->geo,

					       be32_to_cpu(lep->address));

		/*

		 * If it's not the same as the old data block number,

		 * need to pitch the old one and read the new one.
@@ -1281,7 +1283,8 @@ xfs_dir2_leaf_lookup_int( 
		 * Point to the data entry.

		 */

		dep = (xfs_dir2_data_entry_t *)((char *)dbp->b_addr +

			xfs_dir2_dataptr_to_off(mp, be32_to_cpu(lep->address)));

			xfs_dir2_dataptr_to_off(args->geo,

						be32_to_cpu(lep->address)));

		/*

		 * Compare name and if it's an exact match, return the index

		 * and buffer. If it's the first case-insensitive match, store
@@ -1380,9 +1383,9 @@ xfs_dir2_leaf_removename( 
	 * Point to the leaf entry, use that to point to the data entry.

	 */

	lep = &ents[index];

	db = xfs_dir2_dataptr_to_db(mp, be32_to_cpu(lep->address));

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)hdr + xfs_dir2_dataptr_to_off(mp, be32_to_cpu(lep->address)));

	db = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address));

	dep = (xfs_dir2_data_entry_t *)((char *)hdr +

		xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address)));

	needscan = needlog = 0;

	oldbest = be16_to_cpu(bf[0].length);

	ltp = xfs_dir2_leaf_tail_p(mp, leaf);
@@ -1515,7 +1518,7 @@ xfs_dir2_leaf_replace( 
	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)dbp->b_addr +

	       xfs_dir2_dataptr_to_off(dp->i_mount, be32_to_cpu(lep->address)));

	       xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address)));

	ASSERT(args->inumber != be64_to_cpu(dep->inumber));

	/*

	 * Put the new inode number in, log it.
@@ -1800,7 +1803,8 @@ xfs_dir2_node_to_leaf( 
	 * Get rid of the freespace block.

	 */

	error = xfs_dir2_shrink_inode(args,

			xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET), fbp);

			xfs_dir2_byte_to_db(args->geo, XFS_DIR2_FREE_OFFSET),

			fbp);

	if (error) {

		/*

		 * This can't fail here because it can only happen when