mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

lttng-tools: Update LFS64 patch with upstream feedback

Browse Source 
See https://review.lttng.org/c/lttng-tools/+/9268

(From OE-Core rev: 515ce47f62d34daababb65d206bdae8c4e1e548f)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-02-08 08:47:08 -08:00
committed by Richard Purdie
parent 0f1af550ef
commit e911d154ce
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch
View File

@@ -22,7 +22,14 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8
--- a/src/common/compat/compat-fcntl.c --- a/src/common/compat/compat-fcntl.c
+++ b/src/common/compat/compat-fcntl.c +++ b/src/common/compat/compat-fcntl.c
@@ -13,7 +13,7 @@ @@ -8,14 +8,17 @@
#define _LGPL_SOURCE
#include <common/compat/fcntl.h>
#include <common/macros.h>
+#include <common/bug.h>
+#include <stdint.h>
#include <unistd.h>
#ifdef __linux__ #ifdef __linux__
LTTNG_HIDDEN LTTNG_HIDDEN
@@ -30,25 +37,20 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8
+int compat_sync_file_range(int fd, off_t offset, off_t nbytes, +int compat_sync_file_range(int fd, off_t offset, off_t nbytes,
unsigned int flags) unsigned int flags)
{ {
+ LTTNG_BUILD_BUG_ON(sizeof(off_t) != sizeof(int64_t));
#ifdef HAVE_SYNC_FILE_RANGE #ifdef HAVE_SYNC_FILE_RANGE
return sync_file_range(fd, offset, nbytes, flags);
#else
--- a/src/common/compat/fcntl.h --- a/src/common/compat/fcntl.h
+++ b/src/common/compat/fcntl.h +++ b/src/common/compat/fcntl.h
@@ -8,21 +8,21 @@ @@ -13,16 +13,12 @@
#ifndef _COMPAT_FCNTL_H
#define _COMPAT_FCNTL_H
+#include <assert.h>
#include <fcntl.h>
#include <sys/types.h>
#include <common/compat/errno.h> #include <common/compat/errno.h>
-#if (defined(__CYGWIN__)) -#if (defined(__CYGWIN__))
-typedef long long off64_t; -typedef long long off64_t;
-#endif -#endif
+static_assert(sizeof(off_t) == sizeof(int64_t), -
+ "Build system is misconfigured, off_t must be 64-bit wide");
#if (defined(__FreeBSD__) || defined(__sun__)) #if (defined(__FreeBSD__) || defined(__sun__))
typedef off64_t loff_t; typedef off64_t loff_t;
#endif #endif
@@ -59,7 +61,7 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8
unsigned int flags); unsigned int flags);
#define lttng_sync_file_range(fd, offset, nbytes, flags) \ #define lttng_sync_file_range(fd, offset, nbytes, flags) \
compat_sync_file_range(fd, offset, nbytes, flags) compat_sync_file_range(fd, offset, nbytes, flags)
@@ -37,8 +37,8 @@ extern int compat_sync_file_range(int fd @@ -37,8 +33,8 @@ extern int compat_sync_file_range(int fd
#define SYNC_FILE_RANGE_WAIT_BEFORE 0 #define SYNC_FILE_RANGE_WAIT_BEFORE 0
#define SYNC_FILE_RANGE_WRITE 0 #define SYNC_FILE_RANGE_WRITE 0