diff options
author | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
---|---|---|
committer | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
commit | d07ff6523b1ed24d636365f8479b0db70946dc14 (patch) | |
tree | 802bf35ed93ee4941e193cac24d0888af917913e /fs/xfs/xfs_inode_item.c | |
parent | ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle (diff) | |
parent | thermal: int340x_thermal: fix compile after the UUID API switch (diff) | |
download | kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.gz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.xz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.zip |
Merge branch 'uuid-types'
Merge branch 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
to satisfy dependencies.
Diffstat (limited to 'fs/xfs/xfs_inode_item.c')
-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( in_f->ilf_dsize = in_f32->ilf_dsize; in_f->ilf_ino = in_f32->ilf_ino; /* copy biggest field of ilf_u */ - memcpy(in_f->ilf_u.ilfu_uuid.__u_bits, - in_f32->ilf_u.ilfu_uuid.__u_bits, - sizeof(uuid_t)); + uuid_copy(&in_f->ilf_u.ilfu_uuid, &in_f32->ilf_u.ilfu_uuid); in_f->ilf_blkno = in_f32->ilf_blkno; in_f->ilf_len = in_f32->ilf_len; in_f->ilf_boffset = in_f32->ilf_boffset; @@ -851,9 +849,7 @@ xfs_inode_item_format_convert( in_f->ilf_dsize = in_f64->ilf_dsize; in_f->ilf_ino = in_f64->ilf_ino; /* copy biggest field of ilf_u */ - memcpy(in_f->ilf_u.ilfu_uuid.__u_bits, - in_f64->ilf_u.ilfu_uuid.__u_bits, - sizeof(uuid_t)); + uuid_copy(&in_f->ilf_u.ilfu_uuid, &in_f64->ilf_u.ilfu_uuid); in_f->ilf_blkno = in_f64->ilf_blkno; in_f->ilf_len = in_f64->ilf_len; in_f->ilf_boffset = in_f64->ilf_boffset; |