diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-fast-commit-recovery-path-v5.10.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-fast-commit-recovery-path-v5.10.patch | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-fast-commit-recovery-path-v5.10.patch b/meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-fast-commit-recovery-path-v5.10.patch deleted file mode 100644 index 63d97fa4a3..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-fast-commit-recovery-path-v5.10.patch +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | From b96f5364ba4d5a8b9e8159fe0b9e20d598a1c0f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Mon, 26 Oct 2020 17:03:23 -0400 | ||
4 | Subject: [PATCH 05/16] fix: ext4: fast commit recovery path (v5.10) | ||
5 | |||
6 | See upstream commit : | ||
7 | |||
8 | commit 8016e29f4362e285f0f7e38fadc61a5b7bdfdfa2 | ||
9 | Author: Harshad Shirwadkar <harshadshirwadkar@gmail.com> | ||
10 | Date: Thu Oct 15 13:37:59 2020 -0700 | ||
11 | |||
12 | ext4: fast commit recovery path | ||
13 | |||
14 | This patch adds fast commit recovery path support for Ext4 file | ||
15 | system. We add several helper functions that are similar in spirit to | ||
16 | e2fsprogs journal recovery path handlers. Example of such functions | ||
17 | include - a simple block allocator, idempotent block bitmap update | ||
18 | function etc. Using these routines and the fast commit log in the fast | ||
19 | commit area, the recovery path (ext4_fc_replay()) performs fast commit | ||
20 | log recovery. | ||
21 | |||
22 | Upstream-Status: Backport | ||
23 | |||
24 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
25 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
26 | Change-Id: Ia65cf44e108f2df0b458f0d335f33a8f18f50baa | ||
27 | --- | ||
28 | instrumentation/events/lttng-module/ext4.h | 40 ++++++++++++++++++++++ | ||
29 | 1 file changed, 40 insertions(+) | ||
30 | |||
31 | diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h | ||
32 | index f9a55e29..5fddccad 100644 | ||
33 | --- a/instrumentation/events/lttng-module/ext4.h | ||
34 | +++ b/instrumentation/events/lttng-module/ext4.h | ||
35 | @@ -1423,6 +1423,18 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent, | ||
36 | ) | ||
37 | ) | ||
38 | |||
39 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) | ||
40 | +LTTNG_TRACEPOINT_EVENT(ext4_load_inode, | ||
41 | + TP_PROTO(struct super_block *sb, unsigned long ino), | ||
42 | + | ||
43 | + TP_ARGS(sb, ino), | ||
44 | + | ||
45 | + TP_FIELDS( | ||
46 | + ctf_integer(dev_t, dev, sb->s_dev) | ||
47 | + ctf_integer(ino_t, ino, ino) | ||
48 | + ) | ||
49 | +) | ||
50 | +#else | ||
51 | LTTNG_TRACEPOINT_EVENT(ext4_load_inode, | ||
52 | TP_PROTO(struct inode *inode), | ||
53 | |||
54 | @@ -2045,6 +2057,34 @@ LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit, | ||
55 | |||
56 | #endif | ||
57 | |||
58 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) | ||
59 | +LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan, | ||
60 | + TP_PROTO(struct super_block *sb, int error, int off), | ||
61 | + | ||
62 | + TP_ARGS(sb, error, off), | ||
63 | + | ||
64 | + TP_FIELDS( | ||
65 | + ctf_integer(dev_t, dev, sb->s_dev) | ||
66 | + ctf_integer(int, error, error) | ||
67 | + ctf_integer(int, off, off) | ||
68 | + ) | ||
69 | +) | ||
70 | + | ||
71 | +LTTNG_TRACEPOINT_EVENT(ext4_fc_replay, | ||
72 | + TP_PROTO(struct super_block *sb, int tag, int ino, int priv1, int priv2), | ||
73 | + | ||
74 | + TP_ARGS(sb, tag, ino, priv1, priv2), | ||
75 | + | ||
76 | + TP_FIELDS( | ||
77 | + ctf_integer(dev_t, dev, sb->s_dev) | ||
78 | + ctf_integer(int, tag, tag) | ||
79 | + ctf_integer(int, ino, ino) | ||
80 | + ctf_integer(int, priv1, priv1) | ||
81 | + ctf_integer(int, priv2, priv2) | ||
82 | + ) | ||
83 | +) | ||
84 | +#endif | ||
85 | + | ||
86 | #endif /* LTTNG_TRACE_EXT4_H */ | ||
87 | |||
88 | /* This part must be outside protection */ | ||
89 | -- | ||
90 | 2.25.1 | ||
91 | |||