locks: rename lock-manager ops

Both the filesystem and the lock manager can associate operations with a
lock.  Confusingly, one of them (fl_release_private) actually has the
same name in both operation structures.

It would save some confusion to give the lock-manager ops different
names.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 57d827d6071d..82e8e52e8790 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -338,21 +338,21 @@ fl_release_private:	maybe		no
 
 ----------------------- lock_manager_operations ---------------------------
 prototypes:
-        int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
-        void (*fl_notify)(struct file_lock *);  /* unblock callback */
-        int (*fl_grant)(struct file_lock *, struct file_lock *, int);
-        void (*fl_release_private)(struct file_lock *);
-        void (*fl_break)(struct file_lock *); /* break_lease callback */
-        int (*fl_change)(struct file_lock **, int);
+        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);
 
 locking rules:
                         file_lock_lock  may block
-fl_compare_owner:       yes             no
-fl_notify:              yes             no
-fl_grant:               no              no
-fl_release_private:     maybe           no
-fl_break:               yes             no
-fl_change               yes             no
+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
 
 --------------------------- buffer_head -----------------------------------
 prototypes: