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

Commit ff9901c1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nathan Scott
Browse files

[XFS] endianess annotations for xfs_dir2_data_entry_t 



SGI-PV: 943272
SGI-Modid: xfs-linux-melb:xfs-kern:25806a

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 3e57ecf6

fs/xfs/xfs_dir2_block.c

+8 −8
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ xfs_dir2_block_addname( 
	/*

	 * Create the new data entry.

	 */

	INT_SET(dep->inumber, ARCH_CONVERT, args->inumber);

	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);
@@ -508,7 +508,7 @@ xfs_dir2_block_getdents( 


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

						    ptr - (char *)block);

		p.ino = INT_GET(dep->inumber, ARCH_CONVERT);

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

#if XFS_BIG_INUMS

		p.ino += mp->m_inoadd;

#endif
@@ -626,7 +626,7 @@ xfs_dir2_block_lookup( 
	/*

	 * Fill in inode number, release the block.

	 */

	args->inumber = INT_GET(dep->inumber, ARCH_CONVERT);

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

	xfs_da_brelse(args->trans, bp);

	return XFS_ERROR(EEXIST);

}
@@ -844,11 +844,11 @@ xfs_dir2_block_replace( 
	 */

	dep = (xfs_dir2_data_entry_t *)

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

	ASSERT(INT_GET(dep->inumber, ARCH_CONVERT) != args->inumber);

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

	/*

	 * Change the inode number to the new value.

	 */

	INT_SET(dep->inumber, ARCH_CONVERT, args->inumber);

	dep->inumber = cpu_to_be64(args->inumber);

	xfs_dir2_data_log_entry(args->trans, bp, dep);

	xfs_dir2_data_check(dp, bp);

	xfs_da_buf_done(bp);
@@ -1130,7 +1130,7 @@ xfs_dir2_sf_to_block( 
	 */

	dep = (xfs_dir2_data_entry_t *)

	      ((char *)block + XFS_DIR2_DATA_DOT_OFFSET);

	INT_SET(dep->inumber, ARCH_CONVERT, dp->i_ino);

	dep->inumber = cpu_to_be64(dp->i_ino);

	dep->namelen = 1;

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

	tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);
@@ -1144,7 +1144,7 @@ xfs_dir2_sf_to_block( 
	 */

	dep = (xfs_dir2_data_entry_t *)

		((char *)block + XFS_DIR2_DATA_DOTDOT_OFFSET);

	INT_SET(dep->inumber, ARCH_CONVERT, 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);
@@ -1193,7 +1193,7 @@ xfs_dir2_sf_to_block( 
		 * Copy a real entry.

		 */

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

		INT_SET(dep->inumber, ARCH_CONVERT, XFS_DIR2_SF_GET_INUMBER(sfp,

		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);

fs/xfs/xfs_dir2_data.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ xfs_dir2_data_check( 
		 */

		dep = (xfs_dir2_data_entry_t *)p;

		ASSERT(dep->namelen != 0);

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

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

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

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

		count++;

fs/xfs/xfs_dir2_data.h

+4 −4
Original line number Diff line number Diff line
@@ -85,11 +85,11 @@ typedef struct xfs_dir2_data_hdr { 
 * Tag appears as the last 2 bytes.

 */

typedef struct xfs_dir2_data_entry {

	xfs_ino_t		inumber;	/* inode number */

	__uint8_t		namelen;	/* name length */

	__uint8_t		name[1];	/* name bytes, no null */

	__be64			inumber;	/* inode number */

	__u8			namelen;	/* name length */

	__u8			name[1];	/* name bytes, no null */

						/* variable offset */

	xfs_dir2_data_off_t	tag;		/* starting offset of us */

	__be16			tag;		/* starting offset of us */

} xfs_dir2_data_entry_t;



/*

fs/xfs/xfs_dir2_leaf.c

+5 −5
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ xfs_dir2_leaf_addname( 
	 * Initialize our new entry (at last).

	 */

	dep = (xfs_dir2_data_entry_t *)dup;

	INT_SET(dep->inumber, ARCH_CONVERT, args->inumber);

	dep->inumber = cpu_to_be64(args->inumber);

	dep->namelen = args->namelen;

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

	tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);
@@ -1098,7 +1098,7 @@ xfs_dir2_leaf_getdents( 


		p->cook = XFS_DIR2_BYTE_TO_DATAPTR(mp, curoff + length);



		p->ino = INT_GET(dep->inumber, ARCH_CONVERT);

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

#if XFS_BIG_INUMS

		p->ino += mp->m_inoadd;

#endif
@@ -1319,7 +1319,7 @@ xfs_dir2_leaf_lookup( 
	/*

	 * Return the found inode number.

	 */

	args->inumber = INT_GET(dep->inumber, ARCH_CONVERT);

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

	xfs_da_brelse(tp, dbp);

	xfs_da_brelse(tp, lbp);

	return XFS_ERROR(EEXIST);
@@ -1606,11 +1606,11 @@ xfs_dir2_leaf_replace( 
	dep = (xfs_dir2_data_entry_t *)

	      ((char *)dbp->data +

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

	ASSERT(args->inumber != INT_GET(dep->inumber, ARCH_CONVERT));

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

	/*

	 * Put the new inode number in, log it.

	 */

	INT_SET(dep->inumber, ARCH_CONVERT, args->inumber);

	dep->inumber = cpu_to_be64(args->inumber);

	tp = args->trans;

	xfs_dir2_data_log_entry(tp, dbp, dep);

	xfs_da_buf_done(dbp);

fs/xfs/xfs_dir2_node.c

+4 −4
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ xfs_dir2_leafn_lookup_int( 
			if (dep->namelen == args->namelen &&

			    dep->name[0] == args->name[0] &&

			    memcmp(dep->name, args->name, args->namelen) == 0) {

				args->inumber = INT_GET(dep->inumber, ARCH_CONVERT);

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

				*indexp = index;

				state->extravalid = 1;

				state->extrablk.bp = curbp;
@@ -1695,7 +1695,7 @@ xfs_dir2_node_addname_int( 
	 * Fill in the new entry and log it.

	 */

	dep = (xfs_dir2_data_entry_t *)dup;

	INT_SET(dep->inumber, ARCH_CONVERT, args->inumber);

	dep->inumber = cpu_to_be64(args->inumber);

	dep->namelen = args->namelen;

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

	tagp = XFS_DIR2_DATA_ENTRY_TAG_P(dep);
@@ -1905,11 +1905,11 @@ xfs_dir2_node_replace( 
		dep = (xfs_dir2_data_entry_t *)

		      ((char *)data +

		       XFS_DIR2_DATAPTR_TO_OFF(state->mp, be32_to_cpu(lep->address)));

		ASSERT(inum != INT_GET(dep->inumber, ARCH_CONVERT));

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

		/*

		 * Fill in the new inode number and log the entry.

		 */

		INT_SET(dep->inumber, ARCH_CONVERT, inum);

		dep->inumber = cpu_to_be64(inum);

		xfs_dir2_data_log_entry(args->trans, state->extrablk.bp, dep);

		rval = 0;

	}