]>
Commit | Line | Data |
---|---|---|
f6e66b01 JR |
1 | commit cf101116238c2e18f6bf927822dbe47aa4e71dec |
2 | Author: Michael Jeanson <mjeanson@efficios.com> | |
3 | Date: Mon Aug 21 14:47:08 2017 -0400 | |
4 | ||
5 | Fix: update ext4 instrumentation for kernel 4.13 | |
6 | ||
7 | See this upstream commit : | |
8 | ||
9 | commit a627b0a7c15ee4d2c87a86d5be5c8167382e8d0d | |
10 | Author: Eric Whitney <enwlinux@gmail.com> | |
11 | Date: Sun Jul 30 22:30:11 2017 -0400 | |
12 | ||
13 | ext4: remove unused metadata accounting variables | |
14 | ||
15 | Two variables in ext4_inode_info, i_reserved_meta_blocks and | |
16 | i_allocated_meta_blocks, are unused. Removing them saves a little | |
17 | memory per in-memory inode and cleans up clutter in several tracepoints. | |
18 | Adjust tracepoint output from ext4_alloc_da_blocks() for consistency | |
19 | and fix a typo and whitespace near these changes. | |
20 | ||
21 | Signed-off-by: Eric Whitney <enwlinux@gmail.com> | |
22 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | |
23 | Reviewed-by: Jan Kara <jack@suse.cz> | |
24 | ||
25 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | |
26 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | |
27 | ||
28 | diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h | |
29 | index e87b534..fe6f802 100644 | |
30 | --- a/instrumentation/events/lttng-module/ext4.h | |
31 | +++ b/instrumentation/events/lttng-module/ext4.h | |
32 | @@ -689,6 +689,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_sync_fs, | |
33 | ) | |
34 | ) | |
35 | ||
36 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) | |
37 | +LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, | |
38 | + TP_PROTO(struct inode *inode), | |
39 | + | |
40 | + TP_ARGS(inode), | |
41 | + | |
42 | + TP_FIELDS( | |
43 | + ctf_integer(dev_t, dev, inode->i_sb->s_dev) | |
44 | + ctf_integer(ino_t, ino, inode->i_ino) | |
45 | + ctf_integer(unsigned int, data_blocks, EXT4_I(inode)->i_reserved_data_blocks) | |
46 | + ) | |
47 | +) | |
48 | +#else | |
49 | LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, | |
50 | TP_PROTO(struct inode *inode), | |
51 | ||
52 | @@ -701,6 +714,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, | |
53 | ctf_integer(unsigned int, meta_blocks, EXT4_I(inode)->i_reserved_meta_blocks) | |
54 | ) | |
55 | ) | |
56 | +#endif | |
57 | ||
58 | LTTNG_TRACEPOINT_EVENT(ext4_mballoc_alloc, | |
59 | TP_PROTO(struct ext4_allocation_context *ac), | |
60 | @@ -833,17 +847,49 @@ LTTNG_TRACEPOINT_EVENT(ext4_forget, | |
61 | ) | |
62 | #endif | |
63 | ||
64 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) | |
65 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) | |
66 | LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, | |
67 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) | |
68 | TP_PROTO(struct inode *inode, int used_blocks, int quota_claim), | |
69 | ||
70 | TP_ARGS(inode, used_blocks, quota_claim), | |
71 | -#else | |
72 | + | |
73 | + TP_FIELDS( | |
74 | + ctf_integer(dev_t, dev, inode->i_sb->s_dev) | |
75 | + ctf_integer(ino_t, ino, inode->i_ino) | |
76 | + ctf_integer(__u64, i_blocks, inode->i_blocks) | |
77 | + ctf_integer(int, used_blocks, used_blocks) | |
78 | + ctf_integer(int, reserved_data_blocks, | |
79 | + EXT4_I(inode)->i_reserved_data_blocks) | |
80 | + ctf_integer(int, quota_claim, quota_claim) | |
81 | + ctf_integer(TP_MODE_T, mode, inode->i_mode) | |
82 | + ) | |
83 | +) | |
84 | +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) | |
85 | +LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, | |
86 | + TP_PROTO(struct inode *inode, int used_blocks, int quota_claim), | |
87 | + | |
88 | + TP_ARGS(inode, used_blocks, quota_claim), | |
89 | + | |
90 | + TP_FIELDS( | |
91 | + ctf_integer(dev_t, dev, inode->i_sb->s_dev) | |
92 | + ctf_integer(ino_t, ino, inode->i_ino) | |
93 | + ctf_integer(__u64, i_blocks, inode->i_blocks) | |
94 | + ctf_integer(int, used_blocks, used_blocks) | |
95 | + ctf_integer(int, reserved_data_blocks, | |
96 | + EXT4_I(inode)->i_reserved_data_blocks) | |
97 | + ctf_integer(int, reserved_meta_blocks, | |
98 | + EXT4_I(inode)->i_reserved_meta_blocks) | |
99 | + ctf_integer(int, allocated_meta_blocks, | |
100 | + EXT4_I(inode)->i_allocated_meta_blocks) | |
101 | + ctf_integer(int, quota_claim, quota_claim) | |
102 | + ctf_integer(TP_MODE_T, mode, inode->i_mode) | |
103 | + ) | |
104 | +) | |
105 | +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) | |
106 | +LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, | |
107 | TP_PROTO(struct inode *inode, int used_blocks), | |
108 | ||
109 | TP_ARGS(inode, used_blocks), | |
110 | -#endif | |
111 | ||
112 | TP_FIELDS( | |
113 | ctf_integer(dev_t, dev, inode->i_sb->s_dev) | |
114 | @@ -856,14 +902,27 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, | |
115 | EXT4_I(inode)->i_reserved_meta_blocks) | |
116 | ctf_integer(int, allocated_meta_blocks, | |
117 | EXT4_I(inode)->i_allocated_meta_blocks) | |
118 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) | |
119 | - ctf_integer(int, quota_claim, quota_claim) | |
120 | -#endif | |
121 | ctf_integer(TP_MODE_T, mode, inode->i_mode) | |
122 | ) | |
123 | ) | |
124 | +#endif | |
125 | ||
126 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) | |
127 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) | |
128 | +LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, | |
129 | + TP_PROTO(struct inode *inode), | |
130 | + | |
131 | + TP_ARGS(inode), | |
132 | + | |
133 | + TP_FIELDS( | |
134 | + ctf_integer(dev_t, dev, inode->i_sb->s_dev) | |
135 | + ctf_integer(ino_t, ino, inode->i_ino) | |
136 | + ctf_integer(__u64, i_blocks, inode->i_blocks) | |
137 | + ctf_integer(int, reserved_data_blocks, | |
138 | + EXT4_I(inode)->i_reserved_data_blocks) | |
139 | + ctf_integer(TP_MODE_T, mode, inode->i_mode) | |
140 | + ) | |
141 | +) | |
142 | +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) | |
143 | LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, | |
144 | TP_PROTO(struct inode *inode), | |
145 | ||
146 | @@ -880,7 +939,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, | |
147 | ctf_integer(TP_MODE_T, mode, inode->i_mode) | |
148 | ) | |
149 | ) | |
150 | -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ | |
151 | +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) | |
152 | LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, | |
153 | TP_PROTO(struct inode *inode, int md_needed), | |
154 | ||
155 | @@ -898,8 +957,25 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, | |
156 | ctf_integer(TP_MODE_T, mode, inode->i_mode) | |
157 | ) | |
158 | ) | |
159 | -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ | |
160 | +#endif | |
161 | + | |
162 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) | |
163 | +LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, | |
164 | + TP_PROTO(struct inode *inode, int freed_blocks), | |
165 | + | |
166 | + TP_ARGS(inode, freed_blocks), | |
167 | ||
168 | + TP_FIELDS( | |
169 | + ctf_integer(dev_t, dev, inode->i_sb->s_dev) | |
170 | + ctf_integer(ino_t, ino, inode->i_ino) | |
171 | + ctf_integer(__u64, i_blocks, inode->i_blocks) | |
172 | + ctf_integer(int, freed_blocks, freed_blocks) | |
173 | + ctf_integer(int, reserved_data_blocks, | |
174 | + EXT4_I(inode)->i_reserved_data_blocks) | |
175 | + ctf_integer(TP_MODE_T, mode, inode->i_mode) | |
176 | + ) | |
177 | +) | |
178 | +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) | |
179 | LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, | |
180 | TP_PROTO(struct inode *inode, int freed_blocks), | |
181 |