From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 13 Mar 2013 19:04:56 +0000 (-0400)
Subject: Fix Linux 3.8 btrfs probe warning
X-Git-Tag: v2.2.0-rc1~10
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4dbf0908feb928be0092c86cd6f20539c39c6c9d;p=lttng-modules.git

Fix Linux 3.8 btrfs probe warning

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h
index c01a6e0b..56cfce5d 100644
--- a/instrumentation/events/lttng-module/btrfs.h
+++ b/instrumentation/events/lttng-module/btrfs.h
@@ -67,9 +67,16 @@ struct extent_state;
 		{ BTRFS_DATA_RELOC_TREE_OBJECTID, "DATA_RELOC_TREE" })
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#define show_root_type(obj)						\
+	obj, ((obj >= BTRFS_DATA_RELOC_TREE_OBJECTID) ||		\
+	      (obj >= BTRFS_ROOT_TREE_OBJECTID &&			\
+	       obj <= BTRFS_CSUM_TREE_OBJECTID)) ? __show_root_type(obj) : "-"
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
 #define show_root_type(obj)						\
 	obj, ((obj >= BTRFS_DATA_RELOC_TREE_OBJECTID) ||		\
 	      (obj <= BTRFS_CSUM_TREE_OBJECTID )) ? __show_root_type(obj) : "-"
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))