[PATCH v2 18/41] filelock: convert locks_{insert,delete}_global_blocked

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

Have locks_insert_global_blocked and locks_delete_global_blocked take a
struct file_lock_core pointer.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/locks.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/fs/locks.c b/fs/locks.c
index ad4bb9cd4c9d..d6d47612527c 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -635,19 +635,18 @@ posix_owner_key(struct file_lock_core *flc)
return (unsigned long) flc->flc_owner;
}

-static void locks_insert_global_blocked(struct file_lock *waiter)
+static void locks_insert_global_blocked(struct file_lock_core *waiter)
{
lockdep_assert_held(&blocked_lock_lock);

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

-static void locks_delete_global_blocked(struct file_lock *waiter)
+static void locks_delete_global_blocked(struct file_lock_core *waiter)
{
lockdep_assert_held(&blocked_lock_lock);

- hash_del(&waiter->fl_core.flc_link);
+ hash_del(&waiter->flc_link);
}

/* Remove waiter from blocker's block list.
@@ -657,7 +656,7 @@ static void locks_delete_global_blocked(struct file_lock *waiter)
*/
static void __locks_delete_block(struct file_lock *waiter)
{
- locks_delete_global_blocked(waiter);
+ locks_delete_global_blocked(&waiter->fl_core);
list_del_init(&waiter->fl_core.flc_blocked_member);
}

@@ -768,7 +767,7 @@ static void __locks_insert_block(struct file_lock *blocker,
list_add_tail(&waiter->fl_core.flc_blocked_member,
&blocker->fl_core.flc_blocked_requests);
if ((blocker->fl_core.flc_flags & (FL_POSIX|FL_OFDLCK)) == FL_POSIX)
- locks_insert_global_blocked(waiter);
+ locks_insert_global_blocked(&waiter->fl_core);

/* The requests in waiter->fl_blocked are known to conflict with
* waiter, but might not conflict with blocker, or the requests

--
2.43.0