Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbaaf538 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files

[XFS] Reduce shouting by removing unnecessary macros from dir2 code. 



SGI-PV: 966505
SGI-Modid: xfs-linux-melb:xfs-kern:28947a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 54aa8e26

fs/xfs/xfs_dir2.c

+6 −6
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ xfs_dir_mount( 
	       XFS_MAX_BLOCKSIZE);

	mp->m_dirblksize = 1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog);

	mp->m_dirblkfsbs = 1 << mp->m_sb.sb_dirblklog;

	mp->m_dirdatablk = XFS_DIR2_DB_TO_DA(mp, XFS_DIR2_DATA_FIRSTDB(mp));

	mp->m_dirleafblk = XFS_DIR2_DB_TO_DA(mp, XFS_DIR2_LEAF_FIRSTDB(mp));

	mp->m_dirfreeblk = XFS_DIR2_DB_TO_DA(mp, XFS_DIR2_FREE_FIRSTDB(mp));

	mp->m_dirdatablk = xfs_dir2_db_to_da(mp, XFS_DIR2_DATA_FIRSTDB(mp));

	mp->m_dirleafblk = xfs_dir2_db_to_da(mp, XFS_DIR2_LEAF_FIRSTDB(mp));

	mp->m_dirfreeblk = xfs_dir2_db_to_da(mp, XFS_DIR2_FREE_FIRSTDB(mp));

	mp->m_attr_node_ents =

		(mp->m_sb.sb_blocksize - (uint)sizeof(xfs_da_node_hdr_t)) /

		(uint)sizeof(xfs_da_node_entry_t);
@@ -554,7 +554,7 @@ xfs_dir2_grow_inode( 
	 */

	if (mapp != &map)

		kmem_free(mapp, sizeof(*mapp) * count);

	*dbp = XFS_DIR2_DA_TO_DB(mp, (xfs_dablk_t)bno);

	*dbp = xfs_dir2_da_to_db(mp, (xfs_dablk_t)bno);

	/*

	 * Update file's size if this is the data space and it grew.

	 */
@@ -706,7 +706,7 @@ xfs_dir2_shrink_inode( 
	dp = args->dp;

	mp = dp->i_mount;

	tp = args->trans;

	da = XFS_DIR2_DB_TO_DA(mp, db);

	da = xfs_dir2_db_to_da(mp, db);

	/*

	 * Unmap the fsblock(s).

	 */
@@ -742,7 +742,7 @@ xfs_dir2_shrink_inode( 
	/*

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

	 */

	if (dp->i_d.di_size > XFS_DIR2_DB_OFF_TO_BYTE(mp, db + 1, 0))

	if (dp->i_d.di_size > xfs_dir2_db_off_to_byte(mp, db + 1, 0))

		return 0;

	bno = da;

	if ((error = xfs_bmap_last_before(tp, dp, &bno, XFS_DATA_FORK))) {

fs/xfs/xfs_dir2_block.c

+49 −49
Original line number Diff line number Diff line
@@ -115,13 +115,13 @@ xfs_dir2_block_addname( 
		xfs_da_brelse(tp, bp);

		return XFS_ERROR(EFSCORRUPTED);

	}

	len = XFS_DIR2_DATA_ENTSIZE(args->namelen);

	len = xfs_dir2_data_entsize(args->namelen);

	/*

	 * Set up pointers to parts of the block.

	 */

	bf = block->hdr.bestfree;

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	blp = XFS_DIR2_BLOCK_LEAF_P(btp);

	btp = xfs_dir2_block_tail_p(mp, block);

	blp = xfs_dir2_block_leaf_p(btp);

	/*

	 * No stale entries?  Need space for entry and new leaf.

	 */
@@ -396,7 +396,7 @@ xfs_dir2_block_addname( 
	 * Fill in the leaf entry.

	 */

	blp[mid].hashval = cpu_to_be32(args->hashval);

	blp[mid].address = cpu_to_be32(XFS_DIR2_BYTE_TO_DATAPTR(mp,

	blp[mid].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,

				(char *)dep - (char *)block));

	xfs_dir2_block_log_leaf(tp, bp, lfloglow, lfloghigh);

	/*
@@ -411,7 +411,7 @@ xfs_dir2_block_addname( 
	dep->inumber = cpu_to_be64(args->inumber);

	dep->namelen = args->namelen;

	memcpy(dep->name, args->name, args->namelen);

	tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);

	tagp = xfs_dir2_data_entry_tag_p(dep);

	*tagp = cpu_to_be16((char *)dep - (char *)block);

	/*

	 * Clean up the bestfree array and log the header, tail, and entry.
@@ -455,7 +455,7 @@ xfs_dir2_block_getdents( 
	/*

	 * If the block number in the offset is out of range, we're done.

	 */

	if (XFS_DIR2_DATAPTR_TO_DB(mp, uio->uio_offset) > mp->m_dirdatablk) {

	if (xfs_dir2_dataptr_to_db(mp, uio->uio_offset) > mp->m_dirdatablk) {

		*eofp = 1;

		return 0;

	}
@@ -471,15 +471,15 @@ xfs_dir2_block_getdents( 
	 * Extract the byte offset we start at from the seek pointer.

	 * We'll skip entries before this.

	 */

	wantoff = XFS_DIR2_DATAPTR_TO_OFF(mp, uio->uio_offset);

	wantoff = xfs_dir2_dataptr_to_off(mp, uio->uio_offset);

	block = bp->data;

	xfs_dir2_data_check(dp, bp);

	/*

	 * Set up values for the loop.

	 */

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	btp = xfs_dir2_block_tail_p(mp, block);

	ptr = (char *)block->u;

	endptr = (char *)XFS_DIR2_BLOCK_LEAF_P(btp);

	endptr = (char *)xfs_dir2_block_leaf_p(btp);

	p.dbp = dbp;

	p.put = put;

	p.uio = uio;
@@ -502,7 +502,7 @@ xfs_dir2_block_getdents( 
		/*

		 * Bump pointer for the next iteration.

		 */

		ptr += XFS_DIR2_DATA_ENTSIZE(dep->namelen);

		ptr += xfs_dir2_data_entsize(dep->namelen);

		/*

		 * The entry is before the desired starting point, skip it.

		 */
@@ -513,7 +513,7 @@ xfs_dir2_block_getdents( 
		 */

		p.namelen = dep->namelen;



		p.cook = XFS_DIR2_DB_OFF_TO_DATAPTR(mp, mp->m_dirdatablk,

		p.cook = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,

						    ptr - (char *)block);

		p.ino = be64_to_cpu(dep->inumber);

#if XFS_BIG_INUMS
@@ -531,7 +531,7 @@ xfs_dir2_block_getdents( 
		 */

		if (!p.done) {

			uio->uio_offset =

				XFS_DIR2_DB_OFF_TO_DATAPTR(mp, mp->m_dirdatablk,

				xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,

					(char *)dep - (char *)block);

			xfs_da_brelse(tp, bp);

			return error;
@@ -545,7 +545,7 @@ xfs_dir2_block_getdents( 
	*eofp = 1;



	uio->uio_offset =

		XFS_DIR2_DB_OFF_TO_DATAPTR(mp, mp->m_dirdatablk + 1, 0);

		xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk + 1, 0);



	xfs_da_brelse(tp, bp);
@@ -569,8 +569,8 @@ xfs_dir2_block_log_leaf( 


	mp = tp->t_mountp;

	block = bp->data;

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	blp = XFS_DIR2_BLOCK_LEAF_P(btp);

	btp = xfs_dir2_block_tail_p(mp, block);

	blp = xfs_dir2_block_leaf_p(btp);

	xfs_da_log_buf(tp, bp, (uint)((char *)&blp[first] - (char *)block),

		(uint)((char *)&blp[last + 1] - (char *)block - 1));

}
@@ -589,7 +589,7 @@ xfs_dir2_block_log_tail( 


	mp = tp->t_mountp;

	block = bp->data;

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	btp = xfs_dir2_block_tail_p(mp, block);

	xfs_da_log_buf(tp, bp, (uint)((char *)btp - (char *)block),

		(uint)((char *)(btp + 1) - (char *)block - 1));

}
@@ -623,13 +623,13 @@ xfs_dir2_block_lookup( 
	mp = dp->i_mount;

	block = bp->data;

	xfs_dir2_data_check(dp, bp);

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	blp = XFS_DIR2_BLOCK_LEAF_P(btp);

	btp = xfs_dir2_block_tail_p(mp, block);

	blp = xfs_dir2_block_leaf_p(btp);

	/*

	 * Get the offset from the leaf entry, to point to the data.

	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)block + XFS_DIR2_DATAPTR_TO_OFF(mp, be32_to_cpu(blp[ent].address)));

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

	/*

	 * Fill in inode number, release the block.

	 */
@@ -675,8 +675,8 @@ xfs_dir2_block_lookup_int( 
	ASSERT(bp != NULL);

	block = bp->data;

	xfs_dir2_data_check(dp, bp);

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	blp = XFS_DIR2_BLOCK_LEAF_P(btp);

	btp = xfs_dir2_block_tail_p(mp, block);

	blp = xfs_dir2_block_leaf_p(btp);

	/*

	 * Loop doing a binary search for our hash value.

	 * Find our entry, ENOENT if it's not there.
@@ -713,7 +713,7 @@ xfs_dir2_block_lookup_int( 
		 * Get pointer to the entry from the leaf.

		 */

		dep = (xfs_dir2_data_entry_t *)

			((char *)block + XFS_DIR2_DATAPTR_TO_OFF(mp, addr));

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

		/*

		 * Compare, if it's right give back buffer & entry number.

		 */
@@ -768,20 +768,20 @@ xfs_dir2_block_removename( 
	tp = args->trans;

	mp = dp->i_mount;

	block = bp->data;

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	blp = XFS_DIR2_BLOCK_LEAF_P(btp);

	btp = xfs_dir2_block_tail_p(mp, block);

	blp = xfs_dir2_block_leaf_p(btp);

	/*

	 * Point to the data entry using the leaf entry.

	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)block + XFS_DIR2_DATAPTR_TO_OFF(mp, be32_to_cpu(blp[ent].address)));

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

	/*

	 * Mark the data entry's space free.

	 */

	needlog = needscan = 0;

	xfs_dir2_data_make_free(tp, bp,

		(xfs_dir2_data_aoff_t)((char *)dep - (char *)block),

		XFS_DIR2_DATA_ENTSIZE(dep->namelen), &needlog, &needscan);

		xfs_dir2_data_entsize(dep->namelen), &needlog, &needscan);

	/*

	 * Fix up the block tail.

	 */
@@ -843,13 +843,13 @@ xfs_dir2_block_replace( 
	dp = args->dp;

	mp = dp->i_mount;

	block = bp->data;

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	blp = XFS_DIR2_BLOCK_LEAF_P(btp);

	btp = xfs_dir2_block_tail_p(mp, block);

	blp = xfs_dir2_block_leaf_p(btp);

	/*

	 * Point to the data entry we need to change.

	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)block + XFS_DIR2_DATAPTR_TO_OFF(mp, be32_to_cpu(blp[ent].address)));

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

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

	/*

	 * Change the inode number to the new value.
@@ -912,7 +912,7 @@ xfs_dir2_leaf_to_block( 
	mp = dp->i_mount;

	leaf = lbp->data;

	ASSERT(be16_to_cpu(leaf->hdr.info.magic) == XFS_DIR2_LEAF1_MAGIC);

	ltp = XFS_DIR2_LEAF_TAIL_P(mp, leaf);

	ltp = xfs_dir2_leaf_tail_p(mp, leaf);

	/*

	 * If there are data blocks other than the first one, take this

	 * opportunity to remove trailing empty data blocks that may have
@@ -920,7 +920,7 @@ xfs_dir2_leaf_to_block( 
	 * These will show up in the leaf bests table.

	 */

	while (dp->i_d.di_size > mp->m_dirblksize) {

		bestsp = XFS_DIR2_LEAF_BESTS_P(ltp);

		bestsp = xfs_dir2_leaf_bests_p(ltp);

		if (be16_to_cpu(bestsp[be32_to_cpu(ltp->bestcount) - 1]) ==

		    mp->m_dirblksize - (uint)sizeof(block->hdr)) {

			if ((error =
@@ -974,14 +974,14 @@ xfs_dir2_leaf_to_block( 
	/*

	 * Initialize the block tail.

	 */

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	btp = xfs_dir2_block_tail_p(mp, block);

	btp->count = cpu_to_be32(be16_to_cpu(leaf->hdr.count) - be16_to_cpu(leaf->hdr.stale));

	btp->stale = 0;

	xfs_dir2_block_log_tail(tp, dbp);

	/*

	 * Initialize the block leaf area.  We compact out stale entries.

	 */

	lep = XFS_DIR2_BLOCK_LEAF_P(btp);

	lep = xfs_dir2_block_leaf_p(btp);

	for (from = to = 0; from < be16_to_cpu(leaf->hdr.count); from++) {

		if (be32_to_cpu(leaf->ents[from].address) == XFS_DIR2_NULL_DATAPTR)

			continue;
@@ -1067,7 +1067,7 @@ xfs_dir2_sf_to_block( 
	ASSERT(dp->i_df.if_bytes == dp->i_d.di_size);

	ASSERT(dp->i_df.if_u1.if_data != NULL);

	sfp = (xfs_dir2_sf_t *)dp->i_df.if_u1.if_data;

	ASSERT(dp->i_d.di_size >= XFS_DIR2_SF_HDR_SIZE(sfp->hdr.i8count));

	ASSERT(dp->i_d.di_size >= xfs_dir2_sf_hdr_size(sfp->hdr.i8count));

	/*

	 * Copy the directory into the stack buffer.

	 * Then pitch the incore inode data so we can make extents.
@@ -1119,10 +1119,10 @@ xfs_dir2_sf_to_block( 
	/*

	 * Fill in the tail.

	 */

	btp = XFS_DIR2_BLOCK_TAIL_P(mp, block);

	btp = xfs_dir2_block_tail_p(mp, block);

	btp->count = cpu_to_be32(sfp->hdr.count + 2);	/* ., .. */

	btp->stale = 0;

	blp = XFS_DIR2_BLOCK_LEAF_P(btp);

	blp = xfs_dir2_block_leaf_p(btp);

	endoffset = (uint)((char *)blp - (char *)block);

	/*

	 * Remove the freespace, we'll manage it.
@@ -1138,25 +1138,25 @@ xfs_dir2_sf_to_block( 
	dep->inumber = cpu_to_be64(dp->i_ino);

	dep->namelen = 1;

	dep->name[0] = '.';

	tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);

	tagp = xfs_dir2_data_entry_tag_p(dep);

	*tagp = cpu_to_be16((char *)dep - (char *)block);

	xfs_dir2_data_log_entry(tp, bp, dep);

	blp[0].hashval = cpu_to_be32(xfs_dir_hash_dot);

	blp[0].address = cpu_to_be32(XFS_DIR2_BYTE_TO_DATAPTR(mp,

	blp[0].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,

				(char *)dep - (char *)block));

	/*

	 * Create entry for ..

	 */

	dep = (xfs_dir2_data_entry_t *)

		((char *)block + XFS_DIR2_DATA_DOTDOT_OFFSET);

	dep->inumber = cpu_to_be64(XFS_DIR2_SF_GET_INUMBER(sfp, &sfp->hdr.parent));

	dep->inumber = cpu_to_be64(xfs_dir2_sf_get_inumber(sfp, &sfp->hdr.parent));

	dep->namelen = 2;

	dep->name[0] = dep->name[1] = '.';

	tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);

	tagp = xfs_dir2_data_entry_tag_p(dep);

	*tagp = cpu_to_be16((char *)dep - (char *)block);

	xfs_dir2_data_log_entry(tp, bp, dep);

	blp[1].hashval = cpu_to_be32(xfs_dir_hash_dotdot);

	blp[1].address = cpu_to_be32(XFS_DIR2_BYTE_TO_DATAPTR(mp,

	blp[1].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,

				(char *)dep - (char *)block));

	offset = XFS_DIR2_DATA_FIRST_OFFSET;

	/*
@@ -1165,7 +1165,7 @@ xfs_dir2_sf_to_block( 
	if ((i = 0) == sfp->hdr.count)

		sfep = NULL;

	else

		sfep = XFS_DIR2_SF_FIRSTENTRY(sfp);

		sfep = xfs_dir2_sf_firstentry(sfp);

	/*

	 * Need to preserve the existing offset values in the sf directory.

	 * Insert holes (unused entries) where necessary.
@@ -1177,7 +1177,7 @@ xfs_dir2_sf_to_block( 
		if (sfep == NULL)

			newoffset = endoffset;

		else

			newoffset = XFS_DIR2_SF_GET_OFFSET(sfep);

			newoffset = xfs_dir2_sf_get_offset(sfep);

		/*

		 * There should be a hole here, make one.

		 */
@@ -1186,7 +1186,7 @@ xfs_dir2_sf_to_block( 
			      ((char *)block + offset);

			dup->freetag = cpu_to_be16(XFS_DIR2_DATA_FREE_TAG);

			dup->length = cpu_to_be16(newoffset - offset);

			*XFS_DIR2_DATA_UNUSED_TAG_P(dup) = cpu_to_be16(

			*xfs_dir2_data_unused_tag_p(dup) = cpu_to_be16(

				((char *)dup - (char *)block));

			xfs_dir2_data_log_unused(tp, bp, dup);

			(void)xfs_dir2_data_freeinsert((xfs_dir2_data_t *)block,
@@ -1198,22 +1198,22 @@ xfs_dir2_sf_to_block( 
		 * Copy a real entry.

		 */

		dep = (xfs_dir2_data_entry_t *)((char *)block + newoffset);

		dep->inumber = cpu_to_be64(XFS_DIR2_SF_GET_INUMBER(sfp,

				XFS_DIR2_SF_INUMBERP(sfep)));

		dep->inumber = cpu_to_be64(xfs_dir2_sf_get_inumber(sfp,

				xfs_dir2_sf_inumberp(sfep)));

		dep->namelen = sfep->namelen;

		memcpy(dep->name, sfep->name, dep->namelen);

		tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);

		tagp = xfs_dir2_data_entry_tag_p(dep);

		*tagp = cpu_to_be16((char *)dep - (char *)block);

		xfs_dir2_data_log_entry(tp, bp, dep);

		blp[2 + i].hashval = cpu_to_be32(xfs_da_hashname(

					(char *)sfep->name, sfep->namelen));

		blp[2 + i].address = cpu_to_be32(XFS_DIR2_BYTE_TO_DATAPTR(mp,

		blp[2 + i].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,

						 (char *)dep - (char *)block));

		offset = (int)((char *)(tagp + 1) - (char *)block);

		if (++i == sfp->hdr.count)

			sfep = NULL;

		else

			sfep = XFS_DIR2_SF_NEXTENTRY(sfp, sfep);

			sfep = xfs_dir2_sf_nextentry(sfp, sfep);

	}

	/* Done with the temporary buffer */

	kmem_free(buf, buf_len);

fs/xfs/xfs_dir2_block.h

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ typedef struct xfs_dir2_block { 
/*

 * Pointer to the leaf header embedded in a data block (1-block format)

 */

#define	XFS_DIR2_BLOCK_TAIL_P(mp,block)	xfs_dir2_block_tail_p(mp,block)

static inline xfs_dir2_block_tail_t *

xfs_dir2_block_tail_p(struct xfs_mount *mp, xfs_dir2_block_t *block)

{
@@ -71,7 +70,6 @@ xfs_dir2_block_tail_p(struct xfs_mount *mp, xfs_dir2_block_t *block) 
/*

 * Pointer to the leaf entries embedded in a data block (1-block format)

 */

#define	XFS_DIR2_BLOCK_LEAF_P(btp)	xfs_dir2_block_leaf_p(btp)

static inline struct xfs_dir2_leaf_entry *

xfs_dir2_block_leaf_p(xfs_dir2_block_tail_t *btp)

{

fs/xfs/xfs_dir2_data.c

+27 −27
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ xfs_dir2_data_check( 
	bf = d->hdr.bestfree;

	p = (char *)d->u;

	if (be32_to_cpu(d->hdr.magic) == XFS_DIR2_BLOCK_MAGIC) {

		btp = XFS_DIR2_BLOCK_TAIL_P(mp, (xfs_dir2_block_t *)d);

		lep = XFS_DIR2_BLOCK_LEAF_P(btp);

		btp = xfs_dir2_block_tail_p(mp, (xfs_dir2_block_t *)d);

		lep = xfs_dir2_block_leaf_p(btp);

		endp = (char *)lep;

	} else

		endp = (char *)d + mp->m_dirblksize;
@@ -107,7 +107,7 @@ xfs_dir2_data_check( 
		 */

		if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG) {

			ASSERT(lastfree == 0);

			ASSERT(be16_to_cpu(*XFS_DIR2_DATA_UNUSED_TAG_P(dup)) ==

			ASSERT(be16_to_cpu(*xfs_dir2_data_unused_tag_p(dup)) ==

			       (char *)dup - (char *)d);

			dfp = xfs_dir2_data_freefind(d, dup);

			if (dfp) {
@@ -131,12 +131,12 @@ xfs_dir2_data_check( 
		dep = (xfs_dir2_data_entry_t *)p;

		ASSERT(dep->namelen != 0);

		ASSERT(xfs_dir_ino_validate(mp, be64_to_cpu(dep->inumber)) == 0);

		ASSERT(be16_to_cpu(*XFS_DIR2_DATA_ENTRY_TAG_P(dep)) ==

		ASSERT(be16_to_cpu(*xfs_dir2_data_entry_tag_p(dep)) ==

		       (char *)dep - (char *)d);

		count++;

		lastfree = 0;

		if (be32_to_cpu(d->hdr.magic) == XFS_DIR2_BLOCK_MAGIC) {

			addr = XFS_DIR2_DB_OFF_TO_DATAPTR(mp, mp->m_dirdatablk,

			addr = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,

				(xfs_dir2_data_aoff_t)

				((char *)dep - (char *)d));

			hash = xfs_da_hashname((char *)dep->name, dep->namelen);
@@ -147,7 +147,7 @@ xfs_dir2_data_check( 
			}

			ASSERT(i < be32_to_cpu(btp->count));

		}

		p += XFS_DIR2_DATA_ENTSIZE(dep->namelen);

		p += xfs_dir2_data_entsize(dep->namelen);

	}

	/*

	 * Need to have seen all the entries and all the bestfree slots.
@@ -346,8 +346,8 @@ xfs_dir2_data_freescan( 
	 */

	p = (char *)d->u;

	if (be32_to_cpu(d->hdr.magic) == XFS_DIR2_BLOCK_MAGIC) {

		btp = XFS_DIR2_BLOCK_TAIL_P(mp, (xfs_dir2_block_t *)d);

		endp = (char *)XFS_DIR2_BLOCK_LEAF_P(btp);

		btp = xfs_dir2_block_tail_p(mp, (xfs_dir2_block_t *)d);

		endp = (char *)xfs_dir2_block_leaf_p(btp);

	} else

		endp = (char *)d + mp->m_dirblksize;

	/*
@@ -360,7 +360,7 @@ xfs_dir2_data_freescan( 
		 */

		if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG) {

			ASSERT((char *)dup - (char *)d ==

			       be16_to_cpu(*XFS_DIR2_DATA_UNUSED_TAG_P(dup)));

			       be16_to_cpu(*xfs_dir2_data_unused_tag_p(dup)));

			xfs_dir2_data_freeinsert(d, dup, loghead);

			p += be16_to_cpu(dup->length);

		}
@@ -370,8 +370,8 @@ xfs_dir2_data_freescan( 
		else {

			dep = (xfs_dir2_data_entry_t *)p;

			ASSERT((char *)dep - (char *)d ==

			       be16_to_cpu(*XFS_DIR2_DATA_ENTRY_TAG_P(dep)));

			p += XFS_DIR2_DATA_ENTSIZE(dep->namelen);

			       be16_to_cpu(*xfs_dir2_data_entry_tag_p(dep)));

			p += xfs_dir2_data_entsize(dep->namelen);

		}

	}

}
@@ -402,7 +402,7 @@ xfs_dir2_data_init( 
	/*

	 * Get the buffer set up for the block.

	 */

	error = xfs_da_get_buf(tp, dp, XFS_DIR2_DB_TO_DA(mp, blkno), -1, &bp,

	error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(mp, blkno), -1, &bp,

		XFS_DATA_FORK);

	if (error) {

		return error;
@@ -427,7 +427,7 @@ xfs_dir2_data_init( 
	t=mp->m_dirblksize - (uint)sizeof(d->hdr);

	d->hdr.bestfree[0].length = cpu_to_be16(t);

	dup->length = cpu_to_be16(t);

	*XFS_DIR2_DATA_UNUSED_TAG_P(dup) = cpu_to_be16((char *)dup - (char *)d);

	*xfs_dir2_data_unused_tag_p(dup) = cpu_to_be16((char *)dup - (char *)d);

	/*

	 * Log it and return it.

	 */
@@ -452,7 +452,7 @@ xfs_dir2_data_log_entry( 
	ASSERT(be32_to_cpu(d->hdr.magic) == XFS_DIR2_DATA_MAGIC ||

	       be32_to_cpu(d->hdr.magic) == XFS_DIR2_BLOCK_MAGIC);

	xfs_da_log_buf(tp, bp, (uint)((char *)dep - (char *)d),

		(uint)((char *)(XFS_DIR2_DATA_ENTRY_TAG_P(dep) + 1) -

		(uint)((char *)(xfs_dir2_data_entry_tag_p(dep) + 1) -

		       (char *)d - 1));

}
@@ -497,8 +497,8 @@ xfs_dir2_data_log_unused( 
	 * Log the end (tag) of the unused entry.

	 */

	xfs_da_log_buf(tp, bp,

		(uint)((char *)XFS_DIR2_DATA_UNUSED_TAG_P(dup) - (char *)d),

		(uint)((char *)XFS_DIR2_DATA_UNUSED_TAG_P(dup) - (char *)d +

		(uint)((char *)xfs_dir2_data_unused_tag_p(dup) - (char *)d),

		(uint)((char *)xfs_dir2_data_unused_tag_p(dup) - (char *)d +

		       sizeof(xfs_dir2_data_off_t) - 1));

}
@@ -535,8 +535,8 @@ xfs_dir2_data_make_free( 
		xfs_dir2_block_tail_t	*btp;	/* block tail */



		ASSERT(be32_to_cpu(d->hdr.magic) == XFS_DIR2_BLOCK_MAGIC);

		btp = XFS_DIR2_BLOCK_TAIL_P(mp, (xfs_dir2_block_t *)d);

		endptr = (char *)XFS_DIR2_BLOCK_LEAF_P(btp);

		btp = xfs_dir2_block_tail_p(mp, (xfs_dir2_block_t *)d);

		endptr = (char *)xfs_dir2_block_leaf_p(btp);

	}

	/*

	 * If this isn't the start of the block, then back up to
@@ -587,7 +587,7 @@ xfs_dir2_data_make_free( 
		 * Fix up the new big freespace.

		 */

		be16_add(&prevdup->length, len + be16_to_cpu(postdup->length));

		*XFS_DIR2_DATA_UNUSED_TAG_P(prevdup) =

		*xfs_dir2_data_unused_tag_p(prevdup) =

			cpu_to_be16((char *)prevdup - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, prevdup);

		if (!needscan) {
@@ -621,7 +621,7 @@ xfs_dir2_data_make_free( 
	else if (prevdup) {

		dfp = xfs_dir2_data_freefind(d, prevdup);

		be16_add(&prevdup->length, len);

		*XFS_DIR2_DATA_UNUSED_TAG_P(prevdup) =

		*xfs_dir2_data_unused_tag_p(prevdup) =

			cpu_to_be16((char *)prevdup - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, prevdup);

		/*
@@ -649,7 +649,7 @@ xfs_dir2_data_make_free( 
		newdup = (xfs_dir2_data_unused_t *)((char *)d + offset);

		newdup->freetag = cpu_to_be16(XFS_DIR2_DATA_FREE_TAG);

		newdup->length = cpu_to_be16(len + be16_to_cpu(postdup->length));

		*XFS_DIR2_DATA_UNUSED_TAG_P(newdup) =

		*xfs_dir2_data_unused_tag_p(newdup) =

			cpu_to_be16((char *)newdup - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, newdup);

		/*
@@ -676,7 +676,7 @@ xfs_dir2_data_make_free( 
		newdup = (xfs_dir2_data_unused_t *)((char *)d + offset);

		newdup->freetag = cpu_to_be16(XFS_DIR2_DATA_FREE_TAG);

		newdup->length = cpu_to_be16(len);

		*XFS_DIR2_DATA_UNUSED_TAG_P(newdup) =

		*xfs_dir2_data_unused_tag_p(newdup) =

			cpu_to_be16((char *)newdup - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, newdup);

		(void)xfs_dir2_data_freeinsert(d, newdup, needlogp);
@@ -712,7 +712,7 @@ xfs_dir2_data_use_free( 
	ASSERT(be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG);

	ASSERT(offset >= (char *)dup - (char *)d);

	ASSERT(offset + len <= (char *)dup + be16_to_cpu(dup->length) - (char *)d);

	ASSERT((char *)dup - (char *)d == be16_to_cpu(*XFS_DIR2_DATA_UNUSED_TAG_P(dup)));

	ASSERT((char *)dup - (char *)d == be16_to_cpu(*xfs_dir2_data_unused_tag_p(dup)));

	/*

	 * Look up the entry in the bestfree table.

	 */
@@ -745,7 +745,7 @@ xfs_dir2_data_use_free( 
		newdup = (xfs_dir2_data_unused_t *)((char *)d + offset + len);

		newdup->freetag = cpu_to_be16(XFS_DIR2_DATA_FREE_TAG);

		newdup->length = cpu_to_be16(oldlen - len);

		*XFS_DIR2_DATA_UNUSED_TAG_P(newdup) =

		*xfs_dir2_data_unused_tag_p(newdup) =

			cpu_to_be16((char *)newdup - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, newdup);

		/*
@@ -772,7 +772,7 @@ xfs_dir2_data_use_free( 
	else if (matchback) {

		newdup = dup;

		newdup->length = cpu_to_be16(((char *)d + offset) - (char *)newdup);

		*XFS_DIR2_DATA_UNUSED_TAG_P(newdup) =

		*xfs_dir2_data_unused_tag_p(newdup) =

			cpu_to_be16((char *)newdup - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, newdup);

		/*
@@ -799,13 +799,13 @@ xfs_dir2_data_use_free( 
	else {

		newdup = dup;

		newdup->length = cpu_to_be16(((char *)d + offset) - (char *)newdup);

		*XFS_DIR2_DATA_UNUSED_TAG_P(newdup) =

		*xfs_dir2_data_unused_tag_p(newdup) =

			cpu_to_be16((char *)newdup - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, newdup);

		newdup2 = (xfs_dir2_data_unused_t *)((char *)d + offset + len);

		newdup2->freetag = cpu_to_be16(XFS_DIR2_DATA_FREE_TAG);

		newdup2->length = cpu_to_be16(oldlen - len - be16_to_cpu(newdup->length));

		*XFS_DIR2_DATA_UNUSED_TAG_P(newdup2) =

		*xfs_dir2_data_unused_tag_p(newdup2) =

			cpu_to_be16((char *)newdup2 - (char *)d);

		xfs_dir2_data_log_unused(tp, bp, newdup2);

		/*

fs/xfs/xfs_dir2_data.h

+4 −8
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct xfs_trans; 
#define	XFS_DIR2_DATA_SPACE	0

#define	XFS_DIR2_DATA_OFFSET	(XFS_DIR2_DATA_SPACE * XFS_DIR2_SPACE_SIZE)

#define	XFS_DIR2_DATA_FIRSTDB(mp)	\

	XFS_DIR2_BYTE_TO_DB(mp, XFS_DIR2_DATA_OFFSET)

	xfs_dir2_byte_to_db(mp, XFS_DIR2_DATA_OFFSET)



/*

 * Offsets of . and .. in data space (always block 0)
@@ -52,9 +52,9 @@ struct xfs_trans; 
#define	XFS_DIR2_DATA_DOT_OFFSET	\

	((xfs_dir2_data_aoff_t)sizeof(xfs_dir2_data_hdr_t))

#define	XFS_DIR2_DATA_DOTDOT_OFFSET	\

	(XFS_DIR2_DATA_DOT_OFFSET + XFS_DIR2_DATA_ENTSIZE(1))

	(XFS_DIR2_DATA_DOT_OFFSET + xfs_dir2_data_entsize(1))

#define	XFS_DIR2_DATA_FIRST_OFFSET		\

	(XFS_DIR2_DATA_DOTDOT_OFFSET + XFS_DIR2_DATA_ENTSIZE(2))

	(XFS_DIR2_DATA_DOTDOT_OFFSET + xfs_dir2_data_entsize(2))



/*

 * Structures.
@@ -123,7 +123,6 @@ typedef struct xfs_dir2_data { 
/*

 * Size of a data entry.

 */

#define XFS_DIR2_DATA_ENTSIZE(n)	xfs_dir2_data_entsize(n)

static inline int xfs_dir2_data_entsize(int n)

{

	return (int)roundup(offsetof(xfs_dir2_data_entry_t, name[0]) + (n) + \
@@ -133,19 +132,16 @@ static inline int xfs_dir2_data_entsize(int n) 
/*

 * Pointer to an entry's tag word.

 */

#define	XFS_DIR2_DATA_ENTRY_TAG_P(dep)	xfs_dir2_data_entry_tag_p(dep)

static inline __be16 *

xfs_dir2_data_entry_tag_p(xfs_dir2_data_entry_t *dep)

{

	return (__be16 *)((char *)dep +

		XFS_DIR2_DATA_ENTSIZE(dep->namelen) - sizeof(__be16));

		xfs_dir2_data_entsize(dep->namelen) - sizeof(__be16));

}



/*

 * Pointer to a freespace's tag word.

 */

#define	XFS_DIR2_DATA_UNUSED_TAG_P(dup) \

	xfs_dir2_data_unused_tag_p(dup)

static inline __be16 *

xfs_dir2_data_unused_tag_p(xfs_dir2_data_unused_t *dup)

{