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

Commit f0e28280 authored by Jeff Layton's avatar Jeff Layton
Browse files

xfs: convert to new i_version API 



Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Acked-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Acked-by: default avatarDave Chinner <dchinner@redhat.com>
parent bb8c2d66

fs/xfs/libxfs/xfs_inode_buf.c

+5 −2
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include "xfs_ialloc.h"

#include "xfs_dir2.h"



#include <linux/iversion.h>



/*

 * Check that none of the inode's in the buffer have a next

 * unlinked field of 0.
@@ -264,7 +266,8 @@ xfs_inode_from_disk( 
	to->di_flags	= be16_to_cpu(from->di_flags);



	if (to->di_version == 3) {

		inode->i_version = be64_to_cpu(from->di_changecount);

		inode_set_iversion_queried(inode,

					   be64_to_cpu(from->di_changecount));

		to->di_crtime.t_sec = be32_to_cpu(from->di_crtime.t_sec);

		to->di_crtime.t_nsec = be32_to_cpu(from->di_crtime.t_nsec);

		to->di_flags2 = be64_to_cpu(from->di_flags2);
@@ -314,7 +317,7 @@ xfs_inode_to_disk( 
	to->di_flags = cpu_to_be16(from->di_flags);



	if (from->di_version == 3) {

		to->di_changecount = cpu_to_be64(inode->i_version);

		to->di_changecount = cpu_to_be64(inode_peek_iversion(inode));

		to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.t_sec);

		to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.t_nsec);

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

fs/xfs/xfs_icache.c

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 


#include <linux/kthread.h>

#include <linux/freezer.h>

#include <linux/iversion.h>



/*

 * Allocate and initialise an xfs_inode.
@@ -293,14 +294,14 @@ xfs_reinit_inode( 
	int		error;

	uint32_t	nlink = inode->i_nlink;

	uint32_t	generation = inode->i_generation;

	uint64_t	version = inode->i_version;

	uint64_t	version = inode_peek_iversion(inode);

	umode_t		mode = inode->i_mode;



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



	set_nlink(inode, nlink);

	inode->i_generation = generation;

	inode->i_version = version;

	inode_set_iversion_queried(inode, version);

	inode->i_mode = mode;

	return error;

}

fs/xfs/xfs_inode.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include <linux/log2.h>

#include <linux/iversion.h>



#include "xfs.h"

#include "xfs_fs.h"
@@ -833,7 +834,7 @@ xfs_ialloc( 
	ip->i_d.di_flags = 0;



	if (ip->i_d.di_version == 3) {

		inode->i_version = 1;

		inode_set_iversion(inode, 1);

		ip->i_d.di_flags2 = 0;

		ip->i_d.di_cowextsize = 0;

		ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec;

fs/xfs/xfs_inode_item.c

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "xfs_buf_item.h"

#include "xfs_log.h"



#include <linux/iversion.h>



kmem_zone_t	*xfs_ili_zone;		/* inode log item zone */
@@ -354,7 +355,7 @@ xfs_inode_to_log_dinode( 
	to->di_next_unlinked = NULLAGINO;



	if (from->di_version == 3) {

		to->di_changecount = inode->i_version;

		to->di_changecount = inode_peek_iversion(inode);

		to->di_crtime.t_sec = from->di_crtime.t_sec;

		to->di_crtime.t_nsec = from->di_crtime.t_nsec;

		to->di_flags2 = from->di_flags2;

fs/xfs/xfs_trans_inode.c

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include "xfs_inode_item.h"

#include "xfs_trace.h"



#include <linux/iversion.h>



/*

 * Add a locked inode to the transaction.

 *
@@ -117,7 +119,7 @@ xfs_trans_log_inode( 
	 */

	if (!(ip->i_itemp->ili_item.li_desc->lid_flags & XFS_LID_DIRTY) &&

	    IS_I_VERSION(VFS_I(ip))) {

		VFS_I(ip)->i_version++;

		inode_inc_iversion(VFS_I(ip));

		flags |= XFS_ILOG_CORE;

	}