From 4ff82ec4e9cb8dee6fed47d1e0f92a65eb211b72 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 25 Jun 2024 14:15:39 -0400 Subject: [PATCH] fix: file: Rename fcheck lookup_fd_rcu (v5.10.220) See upstream backported commit: commit c4716bb296504cbc64aeefb370df44e821214c44 Author: Eric W. Biederman Date: Fri Nov 20 17:14:27 2020 -0600 file: Rename fcheck lookup_fd_rcu [ Upstream commit 460b4f812a9d473d4b39d87d37844f9fc30a9eb3 ] Also remove the confusing comment about checking if a fd exists. I could not find one instance in the entire kernel that still matches the description or the reason for the name fcheck. The need for better names became apparent in the last round of discussion of this set of changes[1]. [1] https://lkml.kernel.org/r/CAHk-=wj8BQbgJFLa+J0e=iT-1qpmCRTbPAJ8gd6MJQ=kbRPqyQ@mail.gmail.com Link: https://lkml.kernel.org/r/20201120231441.29911-10-ebiederm@xmission.com Change-Id: Ib880bd8feef1c5d75d2a018cd93a1d464485ab7b Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/wrapper/fdtable.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/wrapper/fdtable.h b/include/wrapper/fdtable.h index d81b4f0b..bd03c08b 100644 --- a/include/wrapper/fdtable.h +++ b/include/wrapper/fdtable.h @@ -19,7 +19,8 @@ struct file *lttng_lookup_fdget_rcu(unsigned int fd) return lookup_fdget_rcu(fd); } -#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) +#elif ((LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) || \ + LTTNG_KERNEL_RANGE(5,10,220, 5,11,0)) static inline struct file *lttng_lookup_fdget_rcu(unsigned int fd) { -- 2.34.1