diff options
author | Benjamin Coddington <bcodding@redhat.com> | 2019-05-23 10:45:48 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2019-07-03 17:52:09 -0400 |
commit | f85d93385e9fe6886a751f647f6812a89bf6bee3 (patch) | |
tree | a827569da63f74a49473de34a388c0c1e00790bb /fs/locks.c | |
parent | 646d73e91b4222ea972953bad4374a5ca903e79d (diff) |
locks: Cleanup lm_compare_owner and lm_owner_key
After the update to use nlm_lockowners for the NLM server, there are no
more users of lm_compare_owner and lm_owner_key.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/locks.c b/fs/locks.c index ec1e4a5df629..0f85e840b2c7 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -658,9 +658,6 @@ static inline int locks_overlap(struct file_lock *fl1, struct file_lock *fl2) | |||
658 | */ | 658 | */ |
659 | static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2) | 659 | static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2) |
660 | { | 660 | { |
661 | if (fl1->fl_lmops && fl1->fl_lmops->lm_compare_owner) | ||
662 | return fl2->fl_lmops == fl1->fl_lmops && | ||
663 | fl1->fl_lmops->lm_compare_owner(fl1, fl2); | ||
664 | return fl1->fl_owner == fl2->fl_owner; | 661 | return fl1->fl_owner == fl2->fl_owner; |
665 | } | 662 | } |
666 | 663 | ||
@@ -701,8 +698,6 @@ static void locks_delete_global_locks(struct file_lock *fl) | |||
701 | static unsigned long | 698 | static unsigned long |
702 | posix_owner_key(struct file_lock *fl) | 699 | posix_owner_key(struct file_lock *fl) |
703 | { | 700 | { |
704 | if (fl->fl_lmops && fl->fl_lmops->lm_owner_key) | ||
705 | return fl->fl_lmops->lm_owner_key(fl); | ||
706 | return (unsigned long)fl->fl_owner; | 701 | return (unsigned long)fl->fl_owner; |
707 | } | 702 | } |
708 | 703 | ||