Skip to contentSkip to conversation

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

PATCH Mathieu Desnoyers 1 participant 1 message May 24, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw

Merged into master, 2.10, 2.9, 2.8, thanks!

Mathieu

Quoted 43 lines · ----- On May 23, 2017, at 9:43 PM, Michael Jeanson [email protected] wrote:

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

See upstream commit e31fb9e00543e5d3c5b686747d3c862bc09b59f3

---
probes/Kbuild | 14 ++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)
probes/Kbuild +8 -7
index 664595d..fe869d0 100644
@@ -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.)
--

2.7.4

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev