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

Commit f37211c3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: remove XFS_IFILESTREAM 



We never test the flag except in xfs_inode_is_filestream, but that
function already tests the on-disk flag or filesystem wide flags,
and is used to decide if we want to set XFS_IFILESTREAM in the
first place.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 22328d71

fs/xfs/xfs_filestream.c

+0 −2
Original line number Diff line number Diff line
@@ -430,8 +430,6 @@ xfs_fstrm_free_func( 
		container_of(mru, fstrm_item_t, mru);

	xfs_inode_t	*ip = item->ip;



	xfs_iflags_clear(ip, XFS_IFILESTREAM);



	/* Drop the reference taken on the AG when the item was added. */

	xfs_filestream_put_ag(ip->i_mount, item->ag);

fs/xfs/xfs_filestream.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ xfs_inode_is_filestream( 
	struct xfs_inode	*ip)

{

	return (ip->i_mount->m_flags & XFS_MOUNT_FILESTREAMS) ||

		xfs_iflags_test(ip, XFS_IFILESTREAM) ||

		(ip->i_d.di_flags & XFS_DIFLAG_FILESTREAM);

}

fs/xfs/xfs_inode.c

+0 −2
Original line number Diff line number Diff line
@@ -849,8 +849,6 @@ xfs_ialloc( 
		error = xfs_filestream_associate(pip, ip);

		if (error < 0)

			return -error;

		if (!error)

			xfs_iflags_set(ip, XFS_IFILESTREAM);

	}



	*ipp = ip;

fs/xfs/xfs_inode.h

+1 −3
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ xfs_get_initial_prid(struct xfs_inode *dp) 
#define XFS_ISTALE		(1 << 1) /* inode has been staled */

#define XFS_IRECLAIMABLE	(1 << 2) /* inode can be reclaimed */

#define XFS_INEW		(1 << 3) /* inode has just been allocated */

#define XFS_IFILESTREAM		(1 << 4) /* inode is in a filestream dir. */

#define XFS_ITRUNCATED		(1 << 5) /* truncated down so flush-on-close */

#define XFS_IDIRTY_RELEASE	(1 << 6) /* dirty release already seen */

#define __XFS_IFLOCK_BIT	7	 /* inode is being flushed right now */
@@ -225,8 +224,7 @@ xfs_get_initial_prid(struct xfs_inode *dp) 
 */

#define XFS_IRECLAIM_RESET_FLAGS	\

	(XFS_IRECLAIMABLE | XFS_IRECLAIM | \

	 XFS_IDIRTY_RELEASE | XFS_ITRUNCATED | \

	 XFS_IFILESTREAM);

	 XFS_IDIRTY_RELEASE | XFS_ITRUNCATED)



/*

 * Synchronize processes attempting to flush the in-core inode back to disk.