Browse Source

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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Christoph Hellwig 11 years ago
parent
commit
f37211c336
4 changed files with 1 additions and 8 deletions
  1. 0 2
      fs/xfs/xfs_filestream.c
  2. 0 1
      fs/xfs/xfs_filestream.h
  3. 0 2
      fs/xfs/xfs_inode.c
  4. 1 3
      fs/xfs/xfs_inode.h

+ 0 - 2
fs/xfs/xfs_filestream.c

@@ -430,8 +430,6 @@ xfs_fstrm_free_func(
 		container_of(mru, fstrm_item_t, mru);
 		container_of(mru, fstrm_item_t, mru);
 	xfs_inode_t	*ip = item->ip;
 	xfs_inode_t	*ip = item->ip;
 
 
-	xfs_iflags_clear(ip, XFS_IFILESTREAM);
-
 	/* Drop the reference taken on the AG when the item was added. */
 	/* Drop the reference taken on the AG when the item was added. */
 	xfs_filestream_put_ag(ip->i_mount, item->ag);
 	xfs_filestream_put_ag(ip->i_mount, item->ag);
 
 

+ 0 - 1
fs/xfs/xfs_filestream.h

@@ -63,7 +63,6 @@ xfs_inode_is_filestream(
 	struct xfs_inode	*ip)
 	struct xfs_inode	*ip)
 {
 {
 	return (ip->i_mount->m_flags & XFS_MOUNT_FILESTREAMS) ||
 	return (ip->i_mount->m_flags & XFS_MOUNT_FILESTREAMS) ||
-		xfs_iflags_test(ip, XFS_IFILESTREAM) ||
 		(ip->i_d.di_flags & XFS_DIFLAG_FILESTREAM);
 		(ip->i_d.di_flags & XFS_DIFLAG_FILESTREAM);
 }
 }
 
 

+ 0 - 2
fs/xfs/xfs_inode.c

@@ -849,8 +849,6 @@ xfs_ialloc(
 		error = xfs_filestream_associate(pip, ip);
 		error = xfs_filestream_associate(pip, ip);
 		if (error < 0)
 		if (error < 0)
 			return -error;
 			return -error;
-		if (!error)
-			xfs_iflags_set(ip, XFS_IFILESTREAM);
 	}
 	}
 
 
 	*ipp = ip;
 	*ipp = ip;

+ 1 - 3
fs/xfs/xfs_inode.h

@@ -209,7 +209,6 @@ xfs_get_initial_prid(struct xfs_inode *dp)
 #define XFS_ISTALE		(1 << 1) /* inode has been staled */
 #define XFS_ISTALE		(1 << 1) /* inode has been staled */
 #define XFS_IRECLAIMABLE	(1 << 2) /* inode can be reclaimed */
 #define XFS_IRECLAIMABLE	(1 << 2) /* inode can be reclaimed */
 #define XFS_INEW		(1 << 3) /* inode has just been allocated */
 #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_ITRUNCATED		(1 << 5) /* truncated down so flush-on-close */
 #define XFS_IDIRTY_RELEASE	(1 << 6) /* dirty release already seen */
 #define XFS_IDIRTY_RELEASE	(1 << 6) /* dirty release already seen */
 #define __XFS_IFLOCK_BIT	7	 /* inode is being flushed right now */
 #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	\
 #define XFS_IRECLAIM_RESET_FLAGS	\
 	(XFS_IRECLAIMABLE | XFS_IRECLAIM | \
 	(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.
  * Synchronize processes attempting to flush the in-core inode back to disk.