From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 23 May 2017 19:43:25 +0000 (-0400)
Subject: Fix: ext3 was completely removed from the kernel in v4.3
X-Git-Tag: v2.9.3~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8f89e22da25c7cc8b82d4b6574631b0632fc37f3;p=lttng-modules.git

Fix: ext3 was completely removed from the kernel in v4.3

Don't display the warning about missing ext3 headers on kernels >= 4.3

See upstream commit e31fb9e00543e5d3c5b686747d3c862bc09b59f3

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

diff --git a/probes/Kbuild b/probes/Kbuild
index a4f6b32a..2f6c7c76 100644
--- a/probes/Kbuild
+++ b/probes/Kbuild
@@ -97,13 +97,15 @@ ifneq ($(CONFIG_EXT3_FS),)
   ext3_dep = $(srctree)/fs/ext3/*.h
   ext3_dep_check = $(wildcard $(ext3_dep))
   ext3 = $(shell \
-    if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
-      if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \
-        -z "$(ext3_dep_check)" ] ; then \
-        echo "warn" ; \
-        exit ; \
+    if [ $(VERSION) -lt 4 -o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -lt 3 \) ] ; then \
+      if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
+        if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \
+          -z "$(ext3_dep_check)" ] ; then \
+          echo "warn" ; \
+          exit ; \
+        fi; \
+        echo "lttng-probe-ext3.o" ; \
       fi; \
-      echo "lttng-probe-ext3.o" ; \
     fi;)
   ifeq ($(ext3),warn)
     $(warning Files $(ext3_dep) not found. Probe "ext3" is disabled. Use full kernel source tree to enable it.)