diff mbox series

[08/20] filelock: convert posix_owner_key to take file_lock_core arg

Message ID 20240116-flsplit-v1-8-c9d0f4370a5d@kernel.org
State Superseded
Headers show
Series filelock: split struct file_lock into file_lock and file_lease structs | expand

Commit Message

Jeff Layton Jan. 16, 2024, 7:46 p.m. UTC 
Convert posix_owner_key to take struct file_lock_core pointer, and fix
up the callers to pass one in.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/locks.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/fs/locks.c b/fs/locks.c
index 0c47497eb1a4..6432bcfb55a0 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -637,9 +637,9 @@  static void locks_delete_global_locks(struct file_lock *fl)
 }
 
 static unsigned long
-posix_owner_key(struct file_lock *fl)
+posix_owner_key(struct file_lock_core *flc)
 {
-	return (unsigned long) fl->fl_core.fl_owner;
+	return (unsigned long) flc->fl_owner;
 }
 
 static void locks_insert_global_blocked(struct file_lock *waiter)
@@ -647,7 +647,7 @@  static void locks_insert_global_blocked(struct file_lock *waiter)
 	lockdep_assert_held(&blocked_lock_lock);
 
 	hash_add(blocked_hash, &waiter->fl_core.fl_link,
-		 posix_owner_key(waiter));
+		 posix_owner_key(&waiter->fl_core));
 }
 
 static void locks_delete_global_blocked(struct file_lock *waiter)
@@ -984,7 +984,7 @@  static struct file_lock *what_owner_is_waiting_for(struct file_lock *block_fl)
 {
 	struct file_lock *fl;
 
-	hash_for_each_possible(blocked_hash, fl, fl_core.fl_link, posix_owner_key(block_fl)) {
+	hash_for_each_possible(blocked_hash, fl, fl_core.fl_link, posix_owner_key(&block_fl->fl_core)) {
 		if (posix_same_owner(&fl->fl_core, &block_fl->fl_core)) {
 			while (fl->fl_core.fl_blocker)
 				fl = fl->fl_core.fl_blocker;