projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.5.6
[lttng-modules.git]
/
lttng-abi.c
diff --git
a/lttng-abi.c
b/lttng-abi.c
index cffebcd8b0fc60a646101d02553bc87a269a6272..5bd7621f13ff5c503a55a4e57ada5b5e5678a451 100644
(file)
--- a/
lttng-abi.c
+++ b/
lttng-abi.c
@@
-541,9
+541,11
@@
unsigned int lttng_metadata_ring_buffer_poll(struct file *filp,
if (finalized)
mask |= POLLHUP;
if (finalized)
mask |= POLLHUP;
+ mutex_lock(&stream->metadata_cache->lock);
if (stream->metadata_cache->metadata_written >
stream->metadata_out)
mask |= POLLIN;
if (stream->metadata_cache->metadata_written >
stream->metadata_out)
mask |= POLLIN;
+ mutex_unlock(&stream->metadata_cache->lock);
}
return mask;
}
return mask;
@@
-841,7
+843,6
@@
int lttng_abi_open_metadata_stream(struct file *channel_file)
metadata_stream->priv = buf;
stream_priv = metadata_stream;
metadata_stream->transport = channel->transport;
metadata_stream->priv = buf;
stream_priv = metadata_stream;
metadata_stream->transport = channel->transport;
- mutex_init(&metadata_stream->lock);
/*
* Since life-time of metadata cache differs from that of
/*
* Since life-time of metadata cache differs from that of
@@
-1197,8
+1198,8
@@
int lttng_metadata_channel_release(struct inode *inode, struct file *file)
struct lttng_channel *channel = file->private_data;
if (channel) {
struct lttng_channel *channel = file->private_data;
if (channel) {
- lttng_metadata_channel_destroy(channel);
fput(channel->session->file);
fput(channel->session->file);
+ lttng_metadata_channel_destroy(channel);
}
return 0;
}
return 0;
This page took
0.023598 seconds
and
4
git commands to generate.