From: Jeff Layton Date: Wed, 31 Jan 2024 23:02:27 +0000 (-0500) Subject: filelock: remove temporary compatibility macros X-Git-Tag: v6.9-rc1~218^2~4^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=282c30f320ba25794b66c2231ab134d15465ef21;p=thirdparty%2Flinux.git filelock: remove temporary compatibility macros Everything has been converted to access fl_core fields directly, so we can now drop these. Signed-off-by: Jeff Layton Link: https://lore.kernel.org/r/20240131-flsplit-v3-46-c6129007ee8d@kernel.org Reviewed-by: NeilBrown Signed-off-by: Christian Brauner --- diff --git a/include/linux/filelock.h b/include/linux/filelock.h index 701780734ae1b..0606e806da766 100644 --- a/include/linux/filelock.h +++ b/include/linux/filelock.h @@ -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;