Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd7487e authored by Amir Goldstein's avatar Amir Goldstein Committed by Christoph Hellwig
Browse files

xfs: use uuid_copy() helper to abstract uuid_t 



uuid_t definition is about to change.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 41bb26f8

fs/xfs/xfs_inode_item.c

+2 −6
Original line number Diff line number Diff line
@@ -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;