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

Commit 9e9a2674 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: move inode generation count to VFS inode 



Pull another 4 bytes out of the xfs_icdinode.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 54d7b5c1

fs/xfs/libxfs/xfs_inode_buf.c

+4 −4
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ xfs_inode_from_disk( 
	inode->i_mtime.tv_nsec = (int)be32_to_cpu(from->di_mtime.t_nsec);

	inode->i_ctime.tv_sec = (int)be32_to_cpu(from->di_ctime.t_sec);

	inode->i_ctime.tv_nsec = (int)be32_to_cpu(from->di_ctime.t_nsec);

	inode->i_generation = be32_to_cpu(from->di_gen);



	to->di_size = be64_to_cpu(from->di_size);

	to->di_nblocks = be64_to_cpu(from->di_nblocks);
@@ -248,7 +249,6 @@ xfs_inode_from_disk( 
	to->di_dmevmask	= be32_to_cpu(from->di_dmevmask);

	to->di_dmstate	= be16_to_cpu(from->di_dmstate);

	to->di_flags	= be16_to_cpu(from->di_flags);

	to->di_gen	= be32_to_cpu(from->di_gen);



	if (to->di_version == 3) {

		to->di_changecount = be64_to_cpu(from->di_changecount);
@@ -286,6 +286,7 @@ xfs_inode_to_disk( 
	to->di_ctime.t_sec = cpu_to_be32(inode->i_ctime.tv_sec);

	to->di_ctime.t_nsec = cpu_to_be32(inode->i_ctime.tv_nsec);

	to->di_nlink = cpu_to_be32(inode->i_nlink);

	to->di_gen = cpu_to_be32(inode->i_generation);



	to->di_size = cpu_to_be64(from->di_size);

	to->di_nblocks = cpu_to_be64(from->di_nblocks);
@@ -297,7 +298,6 @@ xfs_inode_to_disk( 
	to->di_dmevmask = cpu_to_be32(from->di_dmevmask);

	to->di_dmstate = cpu_to_be16(from->di_dmstate);

	to->di_flags = cpu_to_be16(from->di_flags);

	to->di_gen = cpu_to_be32(from->di_gen);



	if (from->di_version == 3) {

		to->di_changecount = cpu_to_be64(from->di_changecount);
@@ -443,7 +443,7 @@ xfs_iread( 
	    !(mp->m_flags & XFS_MOUNT_IKEEP)) {

		/* initialise the on-disk inode core */

		memset(&ip->i_d, 0, sizeof(ip->i_d));

		ip->i_d.di_gen = prandom_u32();

		VFS_I(ip)->i_generation = prandom_u32();

		if (xfs_sb_version_hascrc(&mp->m_sb))

			ip->i_d.di_version = 3;

		else
@@ -491,7 +491,7 @@ xfs_iread( 
		 * that xfs_ialloc won't overwrite or relies on being correct.

		 */

		ip->i_d.di_version = dip->di_version;

		ip->i_d.di_gen = be32_to_cpu(dip->di_gen);

		VFS_I(ip)->i_generation = be32_to_cpu(dip->di_gen);

		ip->i_d.di_flushiter = be16_to_cpu(dip->di_flushiter);



		/*

fs/xfs/libxfs/xfs_inode_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct xfs_icdinode { 
	__uint32_t	di_dmevmask;	/* DMIG event mask */

	__uint16_t	di_dmstate;	/* DMIG state info */

	__uint16_t	di_flags;	/* random flags, XFS_DIFLAG_... */

	__uint32_t	di_gen;		/* generation number */



	__uint64_t	di_changecount;	/* number of attribute changes */

	__uint64_t	di_flags2;	/* more random flags */

fs/xfs/xfs_export.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ xfs_nfs_get_inode( 
		return ERR_PTR(error);

	}



	if (ip->i_d.di_gen != generation) {

	if (VFS_I(ip)->i_generation != generation) {

		IRELE(ip);

		return ERR_PTR(-ESTALE);

	}

fs/xfs/xfs_icache.c

+2 −0
Original line number Diff line number Diff line
@@ -149,10 +149,12 @@ xfs_reinit_inode( 
{

	int		error;

	uint32_t	nlink = inode->i_nlink;

	uint32_t	generation = inode->i_generation;



	error = inode_init_always(mp->m_super, inode);



	set_nlink(inode, nlink);

	inode->i_generation = generation;

	return error;

}

fs/xfs/xfs_inode.c

+1 −4
Original line number Diff line number Diff line
@@ -835,9 +835,6 @@ xfs_ialloc( 
	inode->i_atime = tv;

	inode->i_ctime = tv;



	/*

	 * di_gen will have been taken care of in xfs_iread.

	 */

	ip->i_d.di_extsize = 0;

	ip->i_d.di_dmevmask = 0;

	ip->i_d.di_dmstate = 0;
@@ -2424,7 +2421,7 @@ xfs_ifree( 
	 * Bump the generation count so no one will be confused

	 * by reincarnations of this inode.

	 */

	ip->i_d.di_gen++;

	VFS_I(ip)->i_generation++;

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	if (xic.deleted)