X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Frandom.c;h=d7e53cd140f0a7517fb6ce66b1c492e9959882c8;hb=47beefeb734480aebea4b748151d7f2d6db480e3;hp=eb41769c650f54d1ddb569f207a1bc45e0765292;hpb=6f9e33eac07801365005f3344fd560cb04a400f4;p=lttng-modules.git diff --git a/wrapper/random.c b/wrapper/random.c index eb41769c..d7e53cd1 100644 --- a/wrapper/random.c +++ b/wrapper/random.c @@ -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 = 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; }