Commit bcab2ebf authored Mar 06, 2018 by Nikolay Borisov Committed by Darrick J. Wong Mar 11, 2018

xfs: Remove dead code from inode recover function



The memcpy is guarded by a check which is performed a right before we
call xfs_log_dinode_to_disk. At this point we are sure this check will
always be false otherwise we would have errored out. So let's remove
this dead weight.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent e157ebdc

fs/xfs/xfs_log_recover.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -3173,13 +3173,6 @@ xlog_recover_inode_pass2(
		/* recover the log dinode inode into the on disk inode */
		xfs_log_dinode_to_disk(ldip, dip);

		/* the rest is in on-disk format */
		if (item->ri_buf[1].i_len > isize) {
		memcpy((char *)dip + isize,
		item->ri_buf[1].i_addr + isize,
		item->ri_buf[1].i_len - isize);
		}

		fields = in_f->ilf_fields;
		if (fields & XFS_ILOG_DEV)
		xfs_dinode_put_rdev(dip, in_f->ilf_u.ilfu_rdev);