Commit 6a2b3d7a authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: use uuid_is_null() to verify if an uuid is empty 



At btrfs_is_empty_uuid() we have our custom code to check if an uuid is
empty, however there a kernel uuid library that has a function named
uuid_is_null() which does the same and probably more efficient.

So change btrfs_is_empty_uuid() to use uuid_is_null(), which is almost
a directly replacement, it just wraps the necessary casting since our
uuid types are u8 arrays while the uuid kernel library uses the uuid_t
type, which is just a typedef of an u8 array of 16 elements as well.

Also since the function is now to trivial, make it a static inline
function in fs.h.

Suggested-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent de9c8265

fs/btrfs/fs.c

+0 −9
Original line number Diff line number Diff line
@@ -55,15 +55,6 @@ size_t __attribute_const__ btrfs_get_num_csums(void) 
	return ARRAY_SIZE(btrfs_csums);

}



bool __pure btrfs_is_empty_uuid(const u8 *uuid)

{

	for (int i = 0; i < BTRFS_UUID_SIZE; i++) {

		if (uuid[i] != 0)

			return false;

	}

	return true;

}



/*

 * Start exclusive operation @type, return true on success.

 */

fs/btrfs/fs.h

+4 −1
Original line number Diff line number Diff line
@@ -996,7 +996,10 @@ const char *btrfs_super_csum_name(u16 csum_type); 
const char *btrfs_super_csum_driver(u16 csum_type);

size_t __attribute_const__ btrfs_get_num_csums(void);



bool __pure btrfs_is_empty_uuid(const u8 *uuid);

static inline bool btrfs_is_empty_uuid(const u8 *uuid)

{

	return uuid_is_null((const uuid_t *)uuid);

}



/* Compatibility and incompatibility defines */

void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,