[PATCH v2 16/41] filelock: convert posix_owner_key to take file_lock_core arg

Jeff Layton
2024-01-25T10:44:16Z

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 --git a/fs/locks.c b/fs/locks.c
index bd0cfee230ae..effe84f954f9 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -630,9 +630,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.flc_owner;
+ return (unsigned long) flc->flc_owner;
}

static void locks_insert_global_blocked(struct file_lock *waiter)
@@ -640,7 +640,7 @@ static void locks_insert_global_blocked(struct file_lock *waiter)
lockdep_assert_held(&blocked_lock_lock);

hash_add(blocked_hash, &waiter->fl_core.flc_link,
- posix_owner_key(waiter));
+ posix_owner_key(&waiter->fl_core));
}

static void locks_delete_global_blocked(struct file_lock *waiter)
@@ -977,7 +977,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.flc_link, posix_owner_key(block_fl)) {
+ hash_for_each_possible(blocked_hash, fl, fl_core.flc_link, posix_owner_key(&block_fl->fl_core)) {
if (posix_same_owner(&fl->fl_core, &block_fl->fl_core)) {
while (fl->fl_core.flc_blocker)
fl = fl->fl_core.flc_blocker;

--
2.43.0