projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't perform extra flush on metadata channel
[lttng-modules.git]
/
lttng-statedump-impl.c
diff --git
a/lttng-statedump-impl.c
b/lttng-statedump-impl.c
index bab5d9ff4c2cf1dcdef90e03e777ac5f96a6ebe2..3dc61b0f8e3e3defcbaebe98f10c4979dfa40bb0 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>
@@
-214,18
+216,6
@@
int lttng_enumerate_network_ip_interface(struct lttng_session *session)
}
#endif /* CONFIG_INET */
}
#endif /* CONFIG_INET */
-#ifdef FD_ISSET /* For old kernels lacking close_on_exec() */
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
- return FD_ISSET(fd, fdt->close_on_exec);
-}
-#else
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
- return close_on_exec(fd, fdt);
-}
-#endif
-
static
int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
{
static
int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
{
@@
-327,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);
@@
-412,7
+402,8
@@
void lttng_statedump_process_ns(struct lttng_session *session,
* for details.
*/
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
* for details.
*/
#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,13,11,36, 3,14,0,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0))
proxy = p->nsproxy;
#else
rcu_read_lock();
proxy = p->nsproxy;
#else
rcu_read_lock();
@@
-430,7
+421,8
@@
void lttng_statedump_process_ns(struct lttng_session *session,
p, type, mode, submode, status, NULL);
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
p, type, mode, submode, status, NULL);
}
#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,13,11,36, 3,14,0,0) || \
+ LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0))
/* (nothing) */
#else
rcu_read_unlock();
/* (nothing) */
#else
rcu_read_unlock();
@@
-530,6
+522,8
@@
int do_lttng_statedump(struct lttng_session *session)
return ret;
ret = lttng_enumerate_block_devices(session);
switch (ret) {
return ret;
ret = lttng_enumerate_block_devices(session);
switch (ret) {
+ case 0:
+ break;
case -ENOSYS:
printk(KERN_WARNING "LTTng: block device enumeration is not supported by kernel\n");
break;
case -ENOSYS:
printk(KERN_WARNING "LTTng: block device enumeration is not supported by kernel\n");
break;
This page took
0.024484 seconds
and
4
git commands to generate.