xfs: move the di_forkoff field to struct xfs_inode (7821ea30) · Commits · EulixOS / Software / Kernel

fs/xfs/libxfs/xfs_attr_leaf.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -518,10 +518,10 @@ xfs_attr_copy_value(
		* Query whether the total requested number of attr fork bytes of extended
		* attribute space will be able to fit inline.
		*
		* Returns zero if not, else the di_forkoff fork offset to be used in the
		* Returns zero if not, else the i_forkoff fork offset to be used in the
		* literal area for attribute data once the new bytes have been added.
		*
		* di_forkoff must be 8 byte aligned, hence is stored as a >>3 value;
		* i_forkoff must be 8 byte aligned, hence is stored as a >>3 value;
		* special case for dev/uuid inodes, they have fixed size data forks.
		*/
		int
		@@ -560,7 +560,7 @@ xfs_attr_shortform_bytesfit(
		* literal area rebalancing.
		*/
		if (bytes <= XFS_IFORK_ASIZE(dp))
		return dp->i_d.di_forkoff;
		return dp->i_forkoff;

		/*
		* For attr2 we can try to move the forkoff if there is space in the
		@@ -581,7 +581,7 @@ xfs_attr_shortform_bytesfit(
		* minimum offset only needs to be the space required for
		* the btree root.
		*/
		if (!dp->i_d.di_forkoff && dp->i_df.if_bytes >
		if (!dp->i_forkoff && dp->i_df.if_bytes >
		xfs_default_attroffset(dp))
		dsize = XFS_BMDR_SPACE_CALC(MINDBTPTRS);
		break;
		@@ -592,10 +592,10 @@ xfs_attr_shortform_bytesfit(
		* minforkoff to where the btree root can finish so we have
		* plenty of room for attrs
		*/
		if (dp->i_d.di_forkoff) {
		if (offset < dp->i_d.di_forkoff)
		if (dp->i_forkoff) {
		if (offset < dp->i_forkoff)
		return 0;
		return dp->i_d.di_forkoff;
		return dp->i_forkoff;
		}
		dsize = XFS_BMAP_BROOT_SPACE(mp, dp->i_df.if_broot);
		break;
		@@ -730,7 +730,7 @@ xfs_attr_shortform_add(

		dp = args->dp;
		mp = dp->i_mount;
		dp->i_d.di_forkoff = forkoff;
		dp->i_forkoff = forkoff;

		ifp = dp->i_afp;
		ASSERT(ifp->if_flags & XFS_IFINLINE);
		@@ -770,7 +770,7 @@ xfs_attr_fork_remove(
		xfs_idestroy_fork(ip->i_afp);
		kmem_cache_free(xfs_ifork_zone, ip->i_afp);
		ip->i_afp = NULL;
		ip->i_d.di_forkoff = 0;
		ip->i_forkoff = 0;
		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
		}

		@@ -821,8 +821,8 @@ xfs_attr_shortform_remove(
		xfs_attr_fork_remove(dp, args->trans);
		} else {
		xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);
		dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize);
		ASSERT(dp->i_d.di_forkoff);
		dp->i_forkoff = xfs_attr_shortform_bytesfit(dp, totsize);
		ASSERT(dp->i_forkoff);
		ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) \|\|
		(args->op_flags & XFS_DA_OP_ADDNAME) \|\|
		!(mp->m_flags & XFS_MOUNT_ATTR2) \|\|

fs/xfs/libxfs/xfs_bmap.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -66,13 +66,13 @@ xfs_bmap_compute_maxlevels(
		* either a signed 32-bit number for the data fork, or a signed 16-bit
		* number for the attr fork.
		*
		* Note that we can no longer assume that if we are in ATTR1 that
		* the fork offset of all the inodes will be
		* (xfs_default_attroffset(ip) >> 3) because we could have mounted
		* with ATTR2 and then mounted back with ATTR1, keeping the
		* di_forkoff's fixed but probably at various positions. Therefore,
		* for both ATTR1 and ATTR2 we have to assume the worst case scenario
		* of a minimum size available.
		* Note that we can no longer assume that if we are in ATTR1 that the
		* fork offset of all the inodes will be
		* (xfs_default_attroffset(ip) >> 3) because we could have mounted with
		* ATTR2 and then mounted back with ATTR1, keeping the i_forkoff's fixed
		* but probably at various positions. Therefore, for both ATTR1 and
		* ATTR2 we have to assume the worst case scenario of a minimum size
		* available.
		*/
		if (whichfork == XFS_DATA_FORK) {
		maxleafents = MAXEXTNUM;
		@@ -205,9 +205,9 @@ xfs_default_attroffset(
		}

		/*
		* Helper routine to reset inode di_forkoff field when switching
		* attribute fork from local to extent format - we reset it where
		* possible to make space available for inline data fork extents.
		* Helper routine to reset inode i_forkoff field when switching attribute fork
		* from local to extent format - we reset it where possible to make space
		* available for inline data fork extents.
		*/
		STATIC void
		xfs_bmap_forkoff_reset(
		@@ -219,8 +219,8 @@ xfs_bmap_forkoff_reset(
		ip->i_df.if_format != XFS_DINODE_FMT_BTREE) {
		uint dfl_forkoff = xfs_default_attroffset(ip) >> 3;

		if (dfl_forkoff > ip->i_d.di_forkoff)
		ip->i_d.di_forkoff = dfl_forkoff;
		if (dfl_forkoff > ip->i_forkoff)
		ip->i_forkoff = dfl_forkoff;
		}
		}

		@@ -1038,14 +1038,14 @@ xfs_bmap_set_attrforkoff(
		{
		switch (ip->i_df.if_format) {
		case XFS_DINODE_FMT_DEV:
		ip->i_d.di_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3;
		ip->i_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3;
		break;
		case XFS_DINODE_FMT_LOCAL:
		case XFS_DINODE_FMT_EXTENTS:
		case XFS_DINODE_FMT_BTREE:
		ip->i_d.di_forkoff = xfs_attr_shortform_bytesfit(ip, size);
		if (!ip->i_d.di_forkoff)
		ip->i_d.di_forkoff = xfs_default_attroffset(ip) >> 3;
		ip->i_forkoff = xfs_attr_shortform_bytesfit(ip, size);
		if (!ip->i_forkoff)
		ip->i_forkoff = xfs_default_attroffset(ip) >> 3;
		else if ((ip->i_mount->m_flags & XFS_MOUNT_ATTR2) && version)
		*version = 2;
		break;

fs/xfs/libxfs/xfs_inode_buf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ xfs_inode_from_disk(
		ip->i_disk_size = be64_to_cpu(from->di_size);
		ip->i_nblocks = be64_to_cpu(from->di_nblocks);
		ip->i_extsize = be32_to_cpu(from->di_extsize);
		to->di_forkoff = from->di_forkoff;
		ip->i_forkoff = from->di_forkoff;
		to->di_flags = be16_to_cpu(from->di_flags);

		if (from->di_dmevmask \|\| from->di_dmstate)
		@@ -311,7 +311,7 @@ xfs_inode_to_disk(
		to->di_extsize = cpu_to_be32(ip->i_extsize);
		to->di_nextents = cpu_to_be32(xfs_ifork_nextents(&ip->i_df));
		to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp));
		to->di_forkoff = from->di_forkoff;
		to->di_forkoff = ip->i_forkoff;
		to->di_aformat = xfs_ifork_format(ip->i_afp);
		to->di_flags = cpu_to_be16(from->di_flags);

fs/xfs/libxfs/xfs_inode_buf.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ struct xfs_dinode;
		* format specific structures at the appropriate time.
		*/
		struct xfs_icdinode {
		uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */
		uint16_t di_flags; /* random flags, XFS_DIFLAG_... */

		uint64_t di_flags2; /* more random flags */

fs/xfs/libxfs/xfs_inode_fork.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,8 @@ struct xfs_ifork {
		* Fork handling.
		*/

		#define XFS_IFORK_Q(ip) ((ip)->i_d.di_forkoff != 0)
		#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_d.di_forkoff << 3))
		#define XFS_IFORK_Q(ip) ((ip)->i_forkoff != 0)
		#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_forkoff << 3))

		#define XFS_IFORK_PTR(ip,w) \
		((w) == XFS_DATA_FORK ? \