Add 'kernel_read' wrapper for kernels < v4.14

[lttng-modules.git] / wrapper / random.c

diff --git a/wrapper/random.c b/wrapper/random.c
index eb41769c650f54d1ddb569f207a1bc45e0765292..f67d0f0c997df27e12709135e372a6d90b09992c 100644 (file)
--- a/wrapper/random.c
+++ b/wrapper/random.c
@@ -14,7 +14,7 @@
 /* boot_id depends on sysctl */
 #if defined(CONFIG_SYSCTL)
 
-#include <linux/fs.h>
+#include <wrapper/fs.h>
 #include <linux/file.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
@@ -28,21 +28,12 @@ int wrapper_get_bootid(char *bootid)
        struct file *file;
        int ret;
        ssize_t len;
-       mm_segment_t old_fs;
 
        file = filp_open("/proc/sys/kernel/random/boot_id", O_RDONLY, 0);
        if (IS_ERR(file))
                return PTR_ERR(file);
 
-       old_fs = get_fs();
-       set_fs(KERNEL_DS);
-
-       if (!file->f_op || !file->f_op->read) {
-               ret = -EINVAL;
-               goto end;
-       }
-
-       len = file->f_op->read(file, bootid, BOOT_ID_LEN - 1, &file->f_pos);
+       len = lttng_kernel_read(file, bootid, BOOT_ID_LEN - 1, &file->f_pos);
        if (len != BOOT_ID_LEN - 1) {
                ret = -EINVAL;
                goto end;
@@ -51,7 +42,6 @@ int wrapper_get_bootid(char *bootid)
        bootid[BOOT_ID_LEN - 1] = '\0';
        ret = 0;
 end:
-       set_fs(old_fs);
        filp_close(file, current->files);
        return ret;
 }