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

Commit 50997470 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: reinitialise recycled VFS inode correctly 



We are going to keep certain on-disk information in the VFS inode
rather than in a separate XFS specific stucture, so we have to be
careful of the VFS code clearing that information when we
re-initialise reclaimable cached inodes during lookup. If we don't
do this, then we lose critical information from the inode and that
results in corruption being detected.

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 faeb4e47

fs/xfs/xfs_icache.c

+21 −1
Original line number Diff line number Diff line
@@ -134,6 +134,26 @@ xfs_inode_free( 
	call_rcu(&VFS_I(ip)->i_rcu, xfs_inode_free_callback);

}



/*

 * When we recycle a reclaimable inode, we need to re-initialise the VFS inode

 * part of the structure. This is made more complex by the fact we store

 * information about the on-disk values in the VFS inode and so we can't just

 * overwrite it's values unconditionally. Hence we save the parameters we

 * need to retain across reinitialisation, and rewrite them into the VFS inode

 * after resetting it's state even if resetting fails.

 */

static int

xfs_reinit_inode(

	struct xfs_mount	*mp,

	struct inode		*inode)

{

	int		error;



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



	return error;

}



/*

 * Check the validity of the inode we just found it the cache

 */
@@ -208,7 +228,7 @@ xfs_iget_cache_hit( 
		spin_unlock(&ip->i_flags_lock);

		rcu_read_unlock();



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

		error = xfs_reinit_inode(mp, inode);

		if (error) {

			/*

			 * Re-initializing the inode failed, and we are in deep