projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build x86 kvm probes on kernels >= 4.1-rc1
[lttng-modules.git]
/
lttng-statedump-impl.c
diff --git
a/lttng-statedump-impl.c
b/lttng-statedump-impl.c
index e4caa488e436f0e317bcd72f89a2da79cc128c52..fcbdfa58e99427b03456af07d080bec985f2e9f2 100644
(file)
--- a/
lttng-statedump-impl.c
+++ b/
lttng-statedump-impl.c
@@
-56,6
+56,8
@@
#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"
+#include "wrapper/time.h"
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
@@
-65,6
+67,7
@@
#define CREATE_TRACE_POINTS
#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
#define TRACE_INCLUDE_FILE lttng-statedump
#define CREATE_TRACE_POINTS
#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
#define TRACE_INCLUDE_FILE lttng-statedump
+#define LTTNG_INSTRUMENTATION
#include "instrumentation/events/lttng-module/lttng-statedump.h"
DEFINE_TRACE(lttng_statedump_block_device);
#include "instrumentation/events/lttng-module/lttng-statedump.h"
DEFINE_TRACE(lttng_statedump_block_device);
@@
-236,7
+239,7
@@
int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
* the lock is taken, but we are not aware whether this is
* guaranteed or not, so play safe.
*/
* the lock is taken, but we are not aware whether this is
* guaranteed or not, so play safe.
*/
- if (fd < fdt->max_fds &&
test_bit(fd, fdt->close_on_exec
))
+ if (fd < fdt->max_fds &&
lttng_close_on_exec(fd, fdt
))
flags |= O_CLOEXEC;
if (IS_ERR(s)) {
struct dentry *dentry = file->f_path.dentry;
flags |= O_CLOEXEC;
if (IS_ERR(s)) {
struct dentry *dentry = file->f_path.dentry;
@@
-314,7
+317,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);
@@
-398,12
+401,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 {
@@
-415,9
+420,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.02365 seconds
and
4
git commands to generate.