diff options
| -rw-r--r-- | fs/xfs/xfs_inode_item.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 08cb7d1a4a3a..013cc78d7daf 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c | |||
| @@ -834,9 +834,7 @@ xfs_inode_item_format_convert( | |||
| 834 | in_f->ilf_dsize = in_f32->ilf_dsize; | 834 | in_f->ilf_dsize = in_f32->ilf_dsize; |
| 835 | in_f->ilf_ino = in_f32->ilf_ino; | 835 | in_f->ilf_ino = in_f32->ilf_ino; |
| 836 | /* copy biggest field of ilf_u */ | 836 | /* copy biggest field of ilf_u */ |
| 837 | memcpy(in_f->ilf_u.ilfu_uuid.__u_bits, | 837 | uuid_copy(&in_f->ilf_u.ilfu_uuid, &in_f32->ilf_u.ilfu_uuid); |
| 838 | in_f32->ilf_u.ilfu_uuid.__u_bits, | ||
| 839 | sizeof(uuid_t)); | ||
| 840 | in_f->ilf_blkno = in_f32->ilf_blkno; | 838 | in_f->ilf_blkno = in_f32->ilf_blkno; |
| 841 | in_f->ilf_len = in_f32->ilf_len; | 839 | in_f->ilf_len = in_f32->ilf_len; |
| 842 | in_f->ilf_boffset = in_f32->ilf_boffset; | 840 | in_f->ilf_boffset = in_f32->ilf_boffset; |
| @@ -851,9 +849,7 @@ xfs_inode_item_format_convert( | |||
| 851 | in_f->ilf_dsize = in_f64->ilf_dsize; | 849 | in_f->ilf_dsize = in_f64->ilf_dsize; |
| 852 | in_f->ilf_ino = in_f64->ilf_ino; | 850 | in_f->ilf_ino = in_f64->ilf_ino; |
| 853 | /* copy biggest field of ilf_u */ | 851 | /* copy biggest field of ilf_u */ |
| 854 | memcpy(in_f->ilf_u.ilfu_uuid.__u_bits, | 852 | uuid_copy(&in_f->ilf_u.ilfu_uuid, &in_f64->ilf_u.ilfu_uuid); |
| 855 | in_f64->ilf_u.ilfu_uuid.__u_bits, | ||
| 856 | sizeof(uuid_t)); | ||
| 857 | in_f->ilf_blkno = in_f64->ilf_blkno; | 853 | in_f->ilf_blkno = in_f64->ilf_blkno; |
| 858 | in_f->ilf_len = in_f64->ilf_len; | 854 | in_f->ilf_len = in_f64->ilf_len; |
| 859 | in_f->ilf_boffset = in_f64->ilf_boffset; | 855 | in_f->ilf_boffset = in_f64->ilf_boffset; |