From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 25 Jun 2024 18:15:39 +0000 (-0400)
Subject: fix: file: Rename fcheck lookup_fd_rcu (v5.10.220)
X-Git-Tag: v2.13.14~3
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9d45723b3dbe35c57273536d21784a5f1aeaddad;p=lttng-modules.git

fix: file: Rename fcheck lookup_fd_rcu (v5.10.220)

See upstream backported commit:

  commit c4716bb296504cbc64aeefb370df44e821214c44
  Author: Eric W. Biederman <ebiederm@xmission.com>
  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 <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/wrapper/fdtable.h b/include/wrapper/fdtable.h
index 5e89d66f..b099063d 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)
 {