Commit 068535f1 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds

locks: remove unused lm_release_private

In commit 3b6e2723 ("locks: prevent side-effects of
locks_release_private before file_lock is initialized") we removed the
last user of lm_release_private without removing the field itself.
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2d534926
...@@ -359,7 +359,6 @@ prototypes: ...@@ -359,7 +359,6 @@ prototypes:
int (*lm_compare_owner)(struct file_lock *, struct file_lock *); int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
void (*lm_notify)(struct file_lock *); /* unblock callback */ void (*lm_notify)(struct file_lock *); /* unblock callback */
int (*lm_grant)(struct file_lock *, struct file_lock *, int); int (*lm_grant)(struct file_lock *, struct file_lock *, int);
void (*lm_release_private)(struct file_lock *);
void (*lm_break)(struct file_lock *); /* break_lease callback */ void (*lm_break)(struct file_lock *); /* break_lease callback */
int (*lm_change)(struct file_lock **, int); int (*lm_change)(struct file_lock **, int);
...@@ -368,7 +367,6 @@ locking rules: ...@@ -368,7 +367,6 @@ locking rules:
lm_compare_owner: yes no lm_compare_owner: yes no
lm_notify: yes no lm_notify: yes no
lm_grant: no no lm_grant: no no
lm_release_private: maybe no
lm_break: yes no lm_break: yes no
lm_change yes no lm_change yes no
......
...@@ -200,11 +200,7 @@ void locks_release_private(struct file_lock *fl) ...@@ -200,11 +200,7 @@ void locks_release_private(struct file_lock *fl)
fl->fl_ops->fl_release_private(fl); fl->fl_ops->fl_release_private(fl);
fl->fl_ops = NULL; fl->fl_ops = NULL;
} }
if (fl->fl_lmops) {
if (fl->fl_lmops->lm_release_private)
fl->fl_lmops->lm_release_private(fl);
fl->fl_lmops = NULL; fl->fl_lmops = NULL;
}
} }
EXPORT_SYMBOL_GPL(locks_release_private); EXPORT_SYMBOL_GPL(locks_release_private);
......
...@@ -1162,7 +1162,6 @@ struct lock_manager_operations { ...@@ -1162,7 +1162,6 @@ struct lock_manager_operations {
int (*lm_compare_owner)(struct file_lock *, struct file_lock *); int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
void (*lm_notify)(struct file_lock *); /* unblock callback */ void (*lm_notify)(struct file_lock *); /* unblock callback */
int (*lm_grant)(struct file_lock *, struct file_lock *, int); int (*lm_grant)(struct file_lock *, struct file_lock *, int);
void (*lm_release_private)(struct file_lock *);
void (*lm_break)(struct file_lock *); void (*lm_break)(struct file_lock *);
int (*lm_change)(struct file_lock **, int); int (*lm_change)(struct file_lock **, int);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment