diff options
| author |   Benjamin Coddington <bcodding@redhat.com> | 2019-05-23 10:45:46 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2019-07-03 17:52:08 -0400 |
| commit | 9adfac6d730db5e9c4c294798f5f191b621f8bc3 (patch) | |
| tree | aa416bc53858e8063939e570e60bdaa3b5d0dd59 /fs | |
| parent | lockd: Convert NLM service fl_owner to nlm_lockowner (diff) | |
| download | linux-dev-9adfac6d730db5e9c4c294798f5f191b621f8bc3.tar.xz linux-dev-9adfac6d730db5e9c4c294798f5f191b621f8bc3.zip | |
lockd: Remove lm_compare_owner and lm_owner_key
Now that the NLM server allocates an nlm_lockowner for fl_owner, there's
no need for special hashing or comparison.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/lockd/svclock.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 34c6ee85274e..637c50687fd7 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -788,25 +788,7 @@ nlmsvc_notify_blocked(struct file_lock *fl) printk(KERN_WARNING "lockd: notification for unknown block!\n"); } -static int nlmsvc_same_owner(struct file_lock *fl1, struct file_lock *fl2) -{ - return fl1->fl_owner == fl2->fl_owner && fl1->fl_pid == fl2->fl_pid; -} - -/* - * Since NLM uses two "keys" for tracking locks, we need to hash them down - * to one for the blocked_hash. Here, we're just xor'ing the host address - * with the pid in order to create a key value for picking a hash bucket. - */ -static unsigned long -nlmsvc_owner_key(struct file_lock *fl) -{ - return (unsigned long)fl->fl_owner ^ (unsigned long)fl->fl_pid; -} - const struct lock_manager_operations nlmsvc_lock_operations = { - .lm_compare_owner = nlmsvc_same_owner, - .lm_owner_key = nlmsvc_owner_key, .lm_notify = nlmsvc_notify_blocked, .lm_grant = nlmsvc_grant_deferred, }; |