On Thu, May 18, 2017 at 08:26:43AM +0200, Christoph Hellwig wrote: > From: Amir Goldstein <amir73il@xxxxxxxxx> > > uuid_t definition is about to change. > > Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> > fs/xfs/xfs_inode_item.c | 8 ++------ > 1 file 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; > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
