diff options
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) | |||
788 | printk(KERN_WARNING "lockd: notification for unknown block!\n"); | 788 | printk(KERN_WARNING "lockd: notification for unknown block!\n"); |
789 | } | 789 | } |
790 | 790 | ||
791 | static int nlmsvc_same_owner(struct file_lock *fl1, struct file_lock *fl2) | ||
792 | { | ||
793 | return fl1->fl_owner == fl2->fl_owner && fl1->fl_pid == fl2->fl_pid; | ||
794 | } | ||
795 | |||
796 | /* | ||
797 | * Since NLM uses two "keys" for tracking locks, we need to hash them down | ||
798 | * to one for the blocked_hash. Here, we're just xor'ing the host address | ||
799 | * with the pid in order to create a key value for picking a hash bucket. | ||
800 | */ | ||
801 | static unsigned long | ||
802 | nlmsvc_owner_key(struct file_lock *fl) | ||
803 | { | ||
804 | return (unsigned long)fl->fl_owner ^ (unsigned long)fl->fl_pid; | ||
805 | } | ||
806 | |||
807 | const struct lock_manager_operations nlmsvc_lock_operations = { | 791 | const struct lock_manager_operations nlmsvc_lock_operations = { |
808 | .lm_compare_owner = nlmsvc_same_owner, | ||
809 | .lm_owner_key = nlmsvc_owner_key, | ||
810 | .lm_notify = nlmsvc_notify_blocked, | 792 | .lm_notify = nlmsvc_notify_blocked, |
811 | .lm_grant = nlmsvc_grant_deferred, | 793 | .lm_grant = nlmsvc_grant_deferred, |
812 | }; | 794 | }; |