Commit 88947ea0 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: move xfs_log_dinode_to_disk to the log recovery code 



Move this function to xfs_inode_item_recover.c since there's only one
caller of it.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 9f99c8fe

fs/xfs/libxfs/xfs_inode_buf.c

+0 −52
Original line number Diff line number Diff line
@@ -310,58 +310,6 @@ xfs_inode_to_disk( 
	}

}



void

xfs_log_dinode_to_disk(

	struct xfs_log_dinode	*from,

	struct xfs_dinode	*to)

{

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

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

	to->di_version = from->di_version;

	to->di_format = from->di_format;

	to->di_onlink = 0;

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

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

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

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

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

	memcpy(to->di_pad, from->di_pad, sizeof(to->di_pad));



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

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

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

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

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

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



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

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

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

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

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

	to->di_forkoff = from->di_forkoff;

	to->di_aformat = from->di_aformat;

	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);

		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);

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

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

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

		memcpy(to->di_pad2, from->di_pad2, sizeof(to->di_pad2));

		uuid_copy(&to->di_uuid, &from->di_uuid);

		to->di_flushiter = 0;

	} else {

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

	}

}



static xfs_failaddr_t

xfs_dinode_verify_fork(

	struct xfs_dinode	*dip,

fs/xfs/libxfs/xfs_inode_buf.h

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ void xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *); 
void	xfs_inode_to_disk(struct xfs_inode *ip, struct xfs_dinode *to,

			  xfs_lsn_t lsn);

int	xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from);

void	xfs_log_dinode_to_disk(struct xfs_log_dinode *from,

			       struct xfs_dinode *to);



xfs_failaddr_t xfs_dinode_verify(struct xfs_mount *mp, xfs_ino_t ino,

			   struct xfs_dinode *dip);

fs/xfs/xfs_inode_item_recover.c

+52 −0
Original line number Diff line number Diff line
@@ -115,6 +115,58 @@ out_free_ip: 
	return error;

}



STATIC void

xfs_log_dinode_to_disk(

	struct xfs_log_dinode	*from,

	struct xfs_dinode	*to)

{

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

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

	to->di_version = from->di_version;

	to->di_format = from->di_format;

	to->di_onlink = 0;

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

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

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

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

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

	memcpy(to->di_pad, from->di_pad, sizeof(to->di_pad));



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

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

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

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

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

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



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

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

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

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

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

	to->di_forkoff = from->di_forkoff;

	to->di_aformat = from->di_aformat;

	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);

		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);

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

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

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

		memcpy(to->di_pad2, from->di_pad2, sizeof(to->di_pad2));

		uuid_copy(&to->di_uuid, &from->di_uuid);

		to->di_flushiter = 0;

	} else {

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

	}

}



STATIC int

xlog_recover_inode_commit_pass2(

	struct xlog			*log,

CRA Git | Maintained and supported by SUSTech CRA and CCSE