Commit 0779f4a6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove XFS_IFINLINE 



Just check for an inline format fork instead of the using the equivalent
in-memory XFS_IFINLINE flag.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent ac1e0672

fs/xfs/libxfs/xfs_attr.c

+2 −6
Original line number Diff line number Diff line
@@ -362,10 +362,8 @@ xfs_has_attr( 
	if (!xfs_inode_hasattr(dp))

		return -ENOATTR;



	if (dp->i_afp->if_format == XFS_DINODE_FMT_LOCAL) {

		ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);

	if (dp->i_afp->if_format == XFS_DINODE_FMT_LOCAL)

		return xfs_attr_sf_findname(args, NULL, NULL);

	}



	if (xfs_attr_is_leaf(dp)) {

		error = xfs_attr_leaf_hasname(args, &bp);
@@ -389,10 +387,8 @@ xfs_attr_remove_args( 
	if (!xfs_inode_hasattr(args->dp))

		return -ENOATTR;



	if (args->dp->i_afp->if_format == XFS_DINODE_FMT_LOCAL) {

		ASSERT(args->dp->i_afp->if_flags & XFS_IFINLINE);

	if (args->dp->i_afp->if_format == XFS_DINODE_FMT_LOCAL)

		return xfs_attr_shortform_remove(args);

	}

	if (xfs_attr_is_leaf(args->dp))

		return xfs_attr_leaf_removename(args);

	return xfs_attr_node_removename(args);

fs/xfs/libxfs/xfs_attr_leaf.c

+3 −6
Original line number Diff line number Diff line
@@ -654,9 +654,6 @@ xfs_attr_shortform_create( 
	if (ifp->if_format == XFS_DINODE_FMT_EXTENTS) {

		ifp->if_flags &= ~XFS_IFEXTENTS;	/* just in case */

		ifp->if_format = XFS_DINODE_FMT_LOCAL;

		ifp->if_flags |= XFS_IFINLINE;

	} else {

		ASSERT(ifp->if_flags & XFS_IFINLINE);

	}

	xfs_idata_realloc(dp, sizeof(*hdr), XFS_ATTR_FORK);

	hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data;
@@ -733,7 +730,7 @@ xfs_attr_shortform_add( 
	dp->i_forkoff = forkoff;



	ifp = dp->i_afp;

	ASSERT(ifp->if_flags & XFS_IFINLINE);

	ASSERT(ifp->if_format == XFS_DINODE_FMT_LOCAL);

	sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;

	if (xfs_attr_sf_findname(args, &sfe, NULL) == -EEXIST)

		ASSERT(0);
@@ -851,7 +848,7 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args) 
	trace_xfs_attr_sf_lookup(args);



	ifp = args->dp->i_afp;

	ASSERT(ifp->if_flags & XFS_IFINLINE);

	ASSERT(ifp->if_format == XFS_DINODE_FMT_LOCAL);

	sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;

	sfe = &sf->list[0];

	for (i = 0; i < sf->hdr.count;
@@ -878,7 +875,7 @@ xfs_attr_shortform_getvalue( 
	struct xfs_attr_sf_entry *sfe;

	int			i;



	ASSERT(args->dp->i_afp->if_flags == XFS_IFINLINE);

	ASSERT(args->dp->i_afp->if_format == XFS_DINODE_FMT_LOCAL);

	sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data;

	sfe = &sf->list[0];

	for (i = 0; i < sf->hdr.count;

fs/xfs/libxfs/xfs_bmap.c

+1 −2
Original line number Diff line number Diff line
@@ -805,7 +805,6 @@ xfs_bmap_local_to_extents_empty( 
	ASSERT(ifp->if_nextents == 0);



	xfs_bmap_forkoff_reset(ip, whichfork);

	ifp->if_flags &= ~XFS_IFINLINE;

	ifp->if_flags |= XFS_IFEXTENTS;

	ifp->if_u1.if_root = NULL;

	ifp->if_height = 0;
@@ -850,7 +849,7 @@ xfs_bmap_local_to_extents( 


	flags = 0;

	error = 0;

	ASSERT((ifp->if_flags & (XFS_IFINLINE|XFS_IFEXTENTS)) == XFS_IFINLINE);

	ASSERT(!(ifp->if_flags & XFS_IFEXTENTS));

	memset(&args, 0, sizeof(args));

	args.tp = tp;

	args.mp = ip->i_mount;

fs/xfs/libxfs/xfs_dir2_block.c

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ xfs_dir2_sf_to_block( 


	trace_xfs_dir2_sf_to_block(args);



	ASSERT(ifp->if_flags & XFS_IFINLINE);

	ASSERT(ifp->if_format == XFS_DINODE_FMT_LOCAL);

	ASSERT(dp->i_disk_size >= offsetof(struct xfs_dir2_sf_hdr, parent));



	oldsfp = (xfs_dir2_sf_hdr_t *)ifp->if_u1.if_data;

fs/xfs/libxfs/xfs_dir2_sf.c

+5 −6
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ xfs_dir2_sf_addname( 


	ASSERT(xfs_dir2_sf_lookup(args) == -ENOENT);

	dp = args->dp;

	ASSERT(dp->i_df.if_flags & XFS_IFINLINE);

	ASSERT(dp->i_df.if_format == XFS_DINODE_FMT_LOCAL);

	ASSERT(dp->i_disk_size >= offsetof(struct xfs_dir2_sf_hdr, parent));

	ASSERT(dp->i_df.if_bytes == dp->i_disk_size);

	ASSERT(dp->i_df.if_u1.if_data != NULL);
@@ -830,9 +830,8 @@ xfs_dir2_sf_create( 
		dp->i_df.if_flags &= ~XFS_IFEXTENTS;	/* just in case */

		dp->i_df.if_format = XFS_DINODE_FMT_LOCAL;

		xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE);

		dp->i_df.if_flags |= XFS_IFINLINE;

	}

	ASSERT(dp->i_df.if_flags & XFS_IFINLINE);

	ASSERT(dp->i_df.if_format == XFS_DINODE_FMT_LOCAL);

	ASSERT(dp->i_df.if_bytes == 0);

	i8count = pino > XFS_DIR2_MAX_SHORT_INUM;

	size = xfs_dir2_sf_hdr_size(i8count);
@@ -877,7 +876,7 @@ xfs_dir2_sf_lookup( 


	xfs_dir2_sf_check(args);



	ASSERT(dp->i_df.if_flags & XFS_IFINLINE);

	ASSERT(dp->i_df.if_format == XFS_DINODE_FMT_LOCAL);

	ASSERT(dp->i_disk_size >= offsetof(struct xfs_dir2_sf_hdr, parent));

	ASSERT(dp->i_df.if_bytes == dp->i_disk_size);

	ASSERT(dp->i_df.if_u1.if_data != NULL);
@@ -954,7 +953,7 @@ xfs_dir2_sf_removename( 


	trace_xfs_dir2_sf_removename(args);



	ASSERT(dp->i_df.if_flags & XFS_IFINLINE);

	ASSERT(dp->i_df.if_format == XFS_DINODE_FMT_LOCAL);

	oldsize = (int)dp->i_disk_size;

	ASSERT(oldsize >= offsetof(struct xfs_dir2_sf_hdr, parent));

	ASSERT(dp->i_df.if_bytes == oldsize);
@@ -1053,7 +1052,7 @@ xfs_dir2_sf_replace( 


	trace_xfs_dir2_sf_replace(args);



	ASSERT(dp->i_df.if_flags & XFS_IFINLINE);

	ASSERT(dp->i_df.if_format == XFS_DINODE_FMT_LOCAL);

	ASSERT(dp->i_disk_size >= offsetof(struct xfs_dir2_sf_hdr, parent));

	ASSERT(dp->i_df.if_bytes == dp->i_disk_size);

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