projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: update scsi instrumentation for 3.19+ kernels
[lttng-modules.git]
/
lttng-statedump-impl.c
diff --git
a/lttng-statedump-impl.c
b/lttng-statedump-impl.c
index 656cebb26ba635fe141f0c7f0badde761be6b5a3..2c7fc17853b1b3310faeca057f83db0d8bdc6682 100644
(file)
--- a/
lttng-statedump-impl.c
+++ b/
lttng-statedump-impl.c
@@
-56,6
+56,7
@@
#include "wrapper/irq.h"
#include "wrapper/tracepoint.h"
#include "wrapper/genhd.h"
#include "wrapper/irq.h"
#include "wrapper/tracepoint.h"
#include "wrapper/genhd.h"
+#include "wrapper/file.h"
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
@@
-327,7
+328,7
@@
void lttng_enumerate_task_vm_maps(struct lttng_session *session,
down_read(&mm->mmap_sem);
while (map) {
if (map->vm_file)
down_read(&mm->mmap_sem);
while (map) {
if (map->vm_file)
- ino = map->vm_file->f_dentry->d_inode->i_ino;
+ ino = map->vm_file->
lttng_
f_dentry->d_inode->i_ino;
else
ino = 0;
trace_lttng_statedump_vm_map(session, p, map, ino);
else
ino = 0;
trace_lttng_statedump_vm_map(session, p, map, ino);
@@
-411,12
+412,14
@@
void lttng_statedump_process_ns(struct lttng_session *session,
* "namespaces: Use task_lock and not rcu to protect nsproxy"
* for details.
*/
* "namespaces: Use task_lock and not rcu to protect nsproxy"
* for details.
*/
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
+ proxy = p->nsproxy;
+#else
rcu_read_lock();
proxy = task_nsproxy(p);
rcu_read_lock();
proxy = task_nsproxy(p);
-#else /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
- proxy = p->nsproxy;
-#endif /* #else #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
+#endif
if (proxy) {
pid_ns = lttng_get_proxy_pid_ns(proxy);
do {
if (proxy) {
pid_ns = lttng_get_proxy_pid_ns(proxy);
do {
@@
-428,9
+431,13
@@
void lttng_statedump_process_ns(struct lttng_session *session,
trace_lttng_statedump_process_state(session,
p, type, mode, submode, status, NULL);
}
trace_lttng_statedump_process_state(session,
p, type, mode, submode, status, NULL);
}
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
+ /* (nothing) */
+#else
rcu_read_unlock();
rcu_read_unlock();
-#endif
/* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
+#endif
}
static
}
static
This page took
0.024322 seconds
and
4
git commands to generate.