projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.lttng.org/lttng-tools
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel.c
diff --git
a/src/bin/lttng-sessiond/kernel.c
b/src/bin/lttng-sessiond/kernel.c
index 43c6285773847739afc437de35bbb09cb0f6b0e3..86a1957cf400a2f8c6cd080ff42c28a864dda427 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel.c
+++ b/
src/bin/lttng-sessiond/kernel.c
@@
-623,7
+623,8
@@
int kernel_validate_version(int tracer_fd)
}
/* Validate version */
}
/* Validate version */
- if (version.version > KERN_MODULES_VERSION) {
+ if (version.version != KERN_MODULES_PRE_VERSION
+ && version.version != KERN_MODULES_VERSION) {
goto error_version;
}
goto error_version;
}
@@
-644,6
+645,7
@@
error:
*/
int init_kernel_workarounds(void)
{
*/
int init_kernel_workarounds(void)
{
+ int ret;
FILE *fp;
/*
FILE *fp;
/*
@@
-658,7
+660,10
@@
int init_kernel_workarounds(void)
while (!feof(fp)) {
char buf[37] = "";
while (!feof(fp)) {
char buf[37] = "";
- (void) fread(buf, 1, sizeof(buf), fp);
+ ret = fread(buf, 1, sizeof(buf), fp);
+ if (ret < 0) {
+ /* Ignore error, we don't really care */
+ }
}
fclose(fp);
end_boot_id:
}
fclose(fp);
end_boot_id:
This page took
0.023223 seconds
and
4
git commands to generate.