From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 17 Jun 2016 00:44:44 +0000 (+0000)
Subject: btrfs: fix build with fresh linux/btrfs.h
X-Git-Tag: v4.13~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4bdff69fcedb2e54c7fb251a0384a61776fc88b;p=strace

btrfs: fix build with fresh linux/btrfs.h

Fix build with fresh <linux/btrfs.h> that provides a slightly different
definition of struct btrfs_ioctl_defrag_range_args.

* btrfs.c (btrfs_ioctl): Cast "len" member of
struct btrfs_ioctl_defrag_range_args to uint64_t.
* tests/btrfs.c (btrfs_print_defrag_range_args): Cast "start" and "len"
members of struct btrfs_ioctl_defrag_range_args to uint64_t.
---

diff --git a/btrfs.c b/btrfs.c
index f94565bc..505e8a39 100644
--- a/btrfs.c
+++ b/btrfs.c
@@ -604,7 +604,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
 
 		tprintf("{start=%" PRIu64 ", len=", (uint64_t)args.start);
 
-		tprintf("%" PRIu64, args.len);
+		tprintf("%" PRIu64, (uint64_t) args.len);
 		if (args.len == UINT64_MAX)
 			tprints(" /* UINT64_MAX */");
 
diff --git a/tests/btrfs.c b/tests/btrfs.c
index 45aa08fc..8f91a6c1 100644
--- a/tests/btrfs.c
+++ b/tests/btrfs.c
@@ -691,7 +691,8 @@ static void
 btrfs_print_defrag_range_args(struct btrfs_ioctl_defrag_range_args *args)
 {
 	printf("{start=%" PRIu64", len=%" PRIu64 "%s, flags=",
-		args->start, args->len, maybe_print_uint64max(args->len));
+		(uint64_t) args->start, (uint64_t) args->len,
+		maybe_print_uint64max(args->len));
 
 	printflags(btrfs_defrag_flags, args->flags, "BTRFS_DEFRAG_RANGE_???");
 	printf(", extent_thresh=%u, compress_type=", args->extent_thresh);