Commit 6bd16ff2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Niv Sardi
Browse files

kill dead inode flags 



There are a few inode flags around that aren't used anywhere, so remove
them.  Also update xfsidbg to display all used inode flags correctly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarNiv Sardi <xaiki@sgi.com>
parent 5efcbb85

fs/xfs/linux-2.6/xfs_aops.c

+3 −8
Original line number Diff line number Diff line
@@ -317,14 +317,9 @@ xfs_map_blocks( 
	xfs_iomap_t		*mapp,

	int			flags)

{

	xfs_inode_t		*ip = XFS_I(inode);

	int			error, nmaps = 1;

	int			nmaps = 1;



	error = xfs_iomap(ip, offset, count,

				flags, mapp, &nmaps);

	if (!error && (flags & (BMAPI_WRITE|BMAPI_ALLOCATE)))

		xfs_iflags_set(ip, XFS_IMODIFIED);

	return -error;

	return -xfs_iomap(XFS_I(inode), offset, count, flags, mapp, &nmaps);

}



STATIC_INLINE int

fs/xfs/linux-2.6/xfs_file.c

+2 −8
Original line number Diff line number Diff line
@@ -281,11 +281,8 @@ xfs_file_ioctl( 
	unsigned int	cmd,

	unsigned long	p)

{

	int		error;

	struct inode	*inode = filp->f_path.dentry->d_inode;



	error = xfs_ioctl(XFS_I(inode), filp, 0, cmd, (void __user *)p);

	xfs_iflags_set(XFS_I(inode), XFS_IMODIFIED);



	/* NOTE:  some of the ioctl's return positive #'s as a

	 *	  byte count indicating success, such as
@@ -293,7 +290,7 @@ xfs_file_ioctl( 
	 *	  like most other routines.  This means true

	 *	  errors need to be returned as a negative value.

	 */

	return error;

	return xfs_ioctl(XFS_I(inode), filp, 0, cmd, (void __user *)p);

}



STATIC long
@@ -302,11 +299,8 @@ xfs_file_ioctl_invis( 
	unsigned int	cmd,

	unsigned long	p)

{

	int		error;

	struct inode	*inode = filp->f_path.dentry->d_inode;



	error = xfs_ioctl(XFS_I(inode), filp, IO_INVIS, cmd, (void __user *)p);

	xfs_iflags_set(XFS_I(inode), XFS_IMODIFIED);



	/* NOTE:  some of the ioctl's return positive #'s as a

	 *	  byte count indicating success, such as
@@ -314,7 +308,7 @@ xfs_file_ioctl_invis( 
	 *	  like most other routines.  This means true

	 *	  errors need to be returned as a negative value.

	 */

	return error;

	return xfs_ioctl(XFS_I(inode), filp, IO_INVIS, cmd, (void __user *)p);

}



/*

fs/xfs/linux-2.6/xfs_iops.c

+0 −5
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ xfs_init_security( 
	}



	error = xfs_attr_set(ip, name, value, length, ATTR_SECURE);

	if (!error)

		xfs_iflags_set(ip, XFS_IMODIFIED);



	kfree(name);

	kfree(value);
@@ -261,7 +259,6 @@ xfs_vn_mknod( 
		error = _ACL_INHERIT(inode, mode, default_acl);

		if (unlikely(error))

			goto out_cleanup_inode;

		xfs_iflags_set(ip, XFS_IMODIFIED);

		_ACL_FREE(default_acl);

	}
@@ -377,7 +374,6 @@ xfs_vn_link( 
	if (unlikely(error))

		return -error;



	xfs_iflags_set(XFS_I(dir), XFS_IMODIFIED);

	atomic_inc(&inode->i_count);

	d_instantiate(dentry, inode);

	return 0;
@@ -888,7 +884,6 @@ xfs_setup_inode( 
	inode->i_ctime.tv_sec	= ip->i_d.di_ctime.t_sec;

	inode->i_ctime.tv_nsec	= ip->i_d.di_ctime.t_nsec;

	xfs_diflags_to_iflags(inode, ip);

	xfs_iflags_clear(ip, XFS_IMODIFIED);



	switch (inode->i_mode & S_IFMT) {

	case S_IFREG:

fs/xfs/linux-2.6/xfs_super.c

+0 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,6 @@ xfs_fs_clear_inode( 
	XFS_STATS_DEC(vn_active);



	xfs_inactive(ip);

	xfs_iflags_clear(ip, XFS_IMODIFIED);

}



STATIC void

fs/xfs/xfs_iget.c

+0 −1
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ again: 
	}

	xfs_put_perag(mp, pag);



	xfs_iflags_set(ip, XFS_IMODIFIED);

	*ipp = ip;



	ASSERT(ip->i_df.if_ext_max ==

CRA Git | Maintained and supported by SUSTech CRA and CCSE