sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux 5.15.y: Update fsync backport for new futex dir hierarchy

Browse Source 
Fixes https://github.com/Frogging-Family/linux-tkg/issues/683
This commit is contained in:
Tk-Glitch
2023-01-04 15:25:18 +01:00
parent 5298957d9b
commit 86578256b7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
linux-tkg-patches/5.15/0007-v5.15-fsync.patch
View File

@@ -68,7 +68,7 @@ Signed-off-by: André Almeida <andrealmeid@collabora.com>
Adjusted for v5.9: Removed `put_futex_key` calls. Adjusted for v5.9: Removed `put_futex_key` calls.
--- ---
include/uapi/linux/futex.h | 20 +++ include/uapi/linux/futex.h | 20 +++
kernel/futex.c | 348 +++++++++++++++++++++++++++++++++++++ kernel/futex/core.c | 348 +++++++++++++++++++++++++++++++++++++
2 files changed, 368 insertions(+) 2 files changed, 368 insertions(+)
diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
@@ -114,10 +114,10 @@ index a89eb0accd5e2e..580001e89c6cae 100644
+}; +};
+ +
#endif /* _UAPI_LINUX_FUTEX_H */ #endif /* _UAPI_LINUX_FUTEX_H */
diff --git a/kernel/futex.c b/kernel/futex.c diff --git a/kernel/futex/core.c b/kernel/futex/core.c
index 408cad5e89680f..c30930a955cece 100644 index 408cad5e89680f..c30930a955cece 100644
--- a/kernel/futex.c --- a/kernel/futex/core.c
+++ b/kernel/futex.c +++ b/kernel/futex/core.c
@@ -197,6 +197,8 @@ struct futex_pi_state { @@ -197,6 +197,8 @@ struct futex_pi_state {
* @bitset: bitset for the optional bitmasked wakeup * @bitset: bitset for the optional bitmasked wakeup
* @requeue_state: State field for futex_requeue_pi() * @requeue_state: State field for futex_requeue_pi()
@@ -536,7 +536,7 @@ Subject: [PATCH] futex: Add Proton compatibility code
--- ---
include/uapi/linux/futex.h | 2 +- include/uapi/linux/futex.h | 2 +-
kernel/futex.c | 3 ++- kernel/futex/core.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
@@ -552,10 +552,10 @@ index 580001e89c6cae..a3e760886b8e7e 100644
#define FUTEX_PRIVATE_FLAG 128 #define FUTEX_PRIVATE_FLAG 128
#define FUTEX_CLOCK_REALTIME 256 #define FUTEX_CLOCK_REALTIME 256
diff --git a/kernel/futex.c b/kernel/futex.c diff --git a/kernel/futex/core.c b/kernel/futex/core.c
index c30930a955cece..aa33e66df5c9df 100644 index c30930a955cece..aa33e66df5c9df 100644
--- a/kernel/futex.c --- a/kernel/futex/core.c
+++ b/kernel/futex.c +++ b/kernel/futex/core.c
@@ -4002,7 +4002,7 @@ futex_init_timeout(u32 cmd, u32 op, struct timespec64 *ts, ktime_t *t) @@ -4002,7 +4002,7 @@ futex_init_timeout(u32 cmd, u32 op, struct timespec64 *ts, ktime_t *t)
return -EINVAL; return -EINVAL;