File btrfs-constify-tracepoint-arguments.patch of Package lttng-modules.11968
From: Tony Jones <tonyj@suse.de> Subject: btrfs: constify tracepoint arguments References: bsc#1044912 Signed-off-by: Tony Jones <tonyj@suse.de> X-Info: adjust for SUSE Kernel --- a/instrumentation/events/lttng-module/btrfs.h +++ b/instrumentation/events/lttng-module/btrfs.h @@ -42,7 +42,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit, TP_PROTO(const struct btrfs_root *root), @@ -146,7 +147,7 @@ ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, @@ -285,7 +286,7 @@ #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, TP_PROTO(const struct inode *inode, @@ -379,7 +380,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, TP_PROTO(const struct inode *inode, @@ -587,7 +589,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,103,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,114,94,0,0, 4,4,114,95,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,120,94,0,0, 4,4,120,95,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,126,94,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,126,94,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs, TP_PROTO(const struct btrfs_fs_info *fs_info, int wait), @@ -626,7 +629,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group, TP_PROTO(const struct btrfs_fs_info *fs_info, @@ -753,7 +757,7 @@ ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) || defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head, TP_PROTO(const struct btrfs_fs_info *fs_info, @@ -1000,7 +1004,7 @@ ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk, @@ -1149,7 +1153,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT(btrfs_cow_block, TP_PROTO(const struct btrfs_root *root, const struct extent_buffer *buf, @@ -1189,7 +1194,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation, TP_PROTO(const struct btrfs_fs_info *fs_info, char *type, u64 val, @@ -1223,7 +1229,7 @@ ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent, @@ -1392,7 +1398,7 @@ TP_ARGS(block_group, start, len) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, btrfs_find_free_extent, @@ -1614,7 +1620,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster, TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, @@ -1710,7 +1717,8 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0) || \ + defined(CONFIG_SUSE_KERNEL)) LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state, btrfs_alloc_extent_state,
