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

Commit df33767d authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

uuid: hoist helpers uuid_equal() and uuid_copy() from xfs 



These helper are used to compare and copy two uuid_t type objects.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
[hch: also provide the respective guid_ versions]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent b10bf0e2

fs/xfs/uuid.c

+0 −6
Original line number Diff line number Diff line
@@ -55,9 +55,3 @@ uuid_is_nil(uuid_t *uuid) 
		if (*cp++) return 0;	/* not nil */

	return 1;	/* is nil */

}
 


int

uuid_equal(uuid_t *uuid1, uuid_t *uuid2)

{

	return memcmp(uuid1, uuid2, sizeof(uuid_t)) ? 0 : 1;

}

fs/xfs/uuid.h

+0 −7
Original line number Diff line number Diff line
@@ -19,13 +19,6 @@ 
#define __XFS_SUPPORT_UUID_H__



extern int uuid_is_nil(uuid_t *uuid);

extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2);

extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]);



static inline void

uuid_copy(uuid_t *dst, uuid_t *src)

{

	memcpy(dst, src, sizeof(uuid_t));

}



#endif	/* __XFS_SUPPORT_UUID_H__ */

include/linux/uuid.h

+20 −0
Original line number Diff line number Diff line
@@ -35,6 +35,26 @@ typedef struct { 
 */

#define	UUID_STRING_LEN		36



static inline bool guid_equal(const guid_t *u1, const guid_t *u2)

{

	return memcmp(u1, u2, sizeof(guid_t)) == 0;

}



static inline void guid_copy(guid_t *dst, const guid_t *src)

{

	memcpy(dst, src, sizeof(guid_t));

}



static inline bool uuid_equal(const uuid_t *u1, const uuid_t *u2)

{

	return memcmp(u1, u2, sizeof(uuid_t)) == 0;

}



static inline void uuid_copy(uuid_t *dst, const uuid_t *src)

{

	memcpy(dst, src, sizeof(uuid_t));

}



void generate_random_uuid(unsigned char uuid[16]);



extern void guid_gen(guid_t *u);

lib/test_uuid.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void __init test_uuid_test(const struct test_uuid_data *data) 
		test_uuid_failed("conversion", false, false, data->uuid, NULL);



	total_tests++;

	if (uuid_le_cmp(data->le, le)) {

	if (!guid_equal(&data->le, &le)) {

		sprintf(buf, "%pUl", &le);

		test_uuid_failed("cmp", false, false, data->uuid, buf);

	}
@@ -82,7 +82,7 @@ static void __init test_uuid_test(const struct test_uuid_data *data) 
		test_uuid_failed("conversion", false, true, data->uuid, NULL);



	total_tests++;

	if (uuid_be_cmp(data->be, be)) {

	if (uuid_equal(&data->be, &be)) {

		sprintf(buf, "%pUb", &be);

		test_uuid_failed("cmp", false, true, data->uuid, buf);

	}