xfs: Remove dead code from inode recover function
authorNikolay Borisov <nborisov@suse.com>
Wed, 7 Mar 2018 01:03:30 +0000 (17:03 -0800)
committerDarrick J. Wong <darrick.wong@oracle.com>
Mon, 12 Mar 2018 03:27:55 +0000 (20:27 -0700)
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>
fs/xfs/xfs_log_recover.c

index 1937a93db6e7e434570128f45cd62c674f4fca86..93885f57978aae7f282f9db108663d83800fa995 100644 (file)
@@ -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);