summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-08-01 07:56:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-01 09:01:46 -0700
commit068535f1fef4c90aee23eb7b9b9a71c5b72d7cd0 (patch)
treeca71858417d881bc8f72f4a2a7b035d041f7a43c
parent2d534926205db9ffce4bbbde67cb9b2cee4b835c (diff)
downloadlinux-3.10-068535f1fef4c90aee23eb7b9b9a71c5b72d7cd0.tar.gz
linux-3.10-068535f1fef4c90aee23eb7b9b9a71c5b72d7cd0.tar.bz2
linux-3.10-068535f1fef4c90aee23eb7b9b9a71c5b72d7cd0.zip
locks: remove unused lm_release_private
In commit 3b6e2723f32d ("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: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/filesystems/Locking2
-rw-r--r--fs/locks.c6
-rw-r--r--include/linux/fs.h1
3 files changed, 1 insertions, 8 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 2db1900d753..7f647e17830 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -359,7 +359,6 @@ prototypes:
int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
void (*lm_notify)(struct file_lock *); /* unblock callback */
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 */
int (*lm_change)(struct file_lock **, int);
@@ -368,7 +367,6 @@ locking rules:
lm_compare_owner: yes no
lm_notify: yes no
lm_grant: no no
-lm_release_private: maybe no
lm_break: yes no
lm_change yes no
diff --git a/fs/locks.c b/fs/locks.c
index cdcf219a739..7e81bfc7516 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -200,11 +200,7 @@ void locks_release_private(struct file_lock *fl)
fl->fl_ops->fl_release_private(fl);
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);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index d7eed5b98ae..4ba5c871552 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1162,7 +1162,6 @@ struct lock_manager_operations {
int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
void (*lm_notify)(struct file_lock *); /* unblock callback */
int (*lm_grant)(struct file_lock *, struct file_lock *, int);
- void (*lm_release_private)(struct file_lock *);
void (*lm_break)(struct file_lock *);
int (*lm_change)(struct file_lock **, int);
};