]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
filelock: remove temporary compatibility macros
authorJeff Layton <jlayton@kernel.org>
Wed, 31 Jan 2024 23:02:27 +0000 (18:02 -0500)
committerChristian Brauner <brauner@kernel.org>
Mon, 5 Feb 2024 12:11:44 +0000 (13:11 +0100)
Everything has been converted to access fl_core fields directly, so we
can now drop these.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20240131-flsplit-v3-46-c6129007ee8d@kernel.org
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
include/linux/filelock.h

index 701780734ae1bd8659c825597ca3bc34317e1e8f..0606e806da7664ed9b964f387358bd8d8fe13a95 100644 (file)
@@ -131,22 +131,6 @@ struct file_lock {
        } fl_u;
 } __randomize_layout;
 
-/* Temporary macros to allow building during coccinelle conversion */
-#ifdef _NEED_FILE_LOCK_FIELD_MACROS
-#define fl_list c.flc_list
-#define fl_blocker c.flc_blocker
-#define fl_link c.flc_link
-#define fl_blocked_requests c.flc_blocked_requests
-#define fl_blocked_member c.flc_blocked_member
-#define fl_owner c.flc_owner
-#define fl_flags c.flc_flags
-#define fl_type c.flc_type
-#define fl_pid c.flc_pid
-#define fl_link_cpu c.flc_link_cpu
-#define fl_wait c.flc_wait
-#define fl_file c.flc_file
-#endif
-
 struct file_lock_context {
        spinlock_t              flc_lock;
        struct list_head        flc_flock;