btrfs-progs: ins: print uuid only if it exists
diff mbox

Message ID 7979b9a1-37d6-9eec-79a7-1730b8338b7f@jp.fujitsu.com
State New
Headers show

Commit Message

Misono Tomohiro Oct. 31, 2017, 5:39 a.m. UTC
UUID of ROOT_ITEM is empty if it is not subvolume (and not created by
kernel). So, just skip it if it is empty just like parent/received UUID.

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
---
 print-tree.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Qu Wenruo Oct. 31, 2017, 5:50 a.m. UTC | #1
On 2017年10月31日 13:39, Misono, Tomohiro wrote:
> UUID of ROOT_ITEM is empty if it is not subvolume (and not created by
> kernel). So, just skip it if it is empty just like parent/received UUID.
> 
> Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu
> ---
>  print-tree.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/print-tree.c b/print-tree.c
> index 8abd760..9d1b862 100644
> --- a/print-tree.c
> +++ b/print-tree.c
> @@ -581,8 +581,10 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
>  		flags_str);
>  
>  	if (root_item.generation == root_item.generation_v2) {
> -		uuid_unparse(root_item.uuid, uuid_str);
> -		printf("\t\tuuid %s\n", uuid_str);
> +		if (!empty_uuid(root_item.uuid)) {
> +			uuid_unparse(root_item.uuid, uuid_str);
> +			printf("\t\tuuid %s\n", uuid_str);
> +		}
>  		if (!empty_uuid(root_item.parent_uuid)) {
>  			uuid_unparse(root_item.parent_uuid, uuid_str);
>  			printf("\t\tparent_uuid %s\n", uuid_str);
>

Patch
diff mbox

diff --git a/print-tree.c b/print-tree.c
index 8abd760..9d1b862 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -581,8 +581,10 @@  static void print_root_item(struct extent_buffer *leaf, int slot)
 		flags_str);
 
 	if (root_item.generation == root_item.generation_v2) {
-		uuid_unparse(root_item.uuid, uuid_str);
-		printf("\t\tuuid %s\n", uuid_str);
+		if (!empty_uuid(root_item.uuid)) {
+			uuid_unparse(root_item.uuid, uuid_str);
+			printf("\t\tuuid %s\n", uuid_str);
+		}
 		if (!empty_uuid(root_item.parent_uuid)) {
 			uuid_unparse(root_item.parent_uuid, uuid_str);
 			printf("\t\tparent_uuid %s\n", uuid_str);