NFSD: Clean up _lm_ operation names

[ Upstream commit 35aff0678f99b0623bb72d50112de9e163a19559 ]

The common practice is to name function instances the same as the
method names, but with a uniquifying prefix. Commit aef9583b234a
("NFSD: Get reference of lockowner when coping file_lock") missed
this -- the new function names should both have been of the form
"nfsd4_lm_*".

Before more lock manager operations are added in NFSD, rename these
two functions for consistency.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index fc0d7fbe5d4a681dfae1aa14bc583bcc8c427b70..5f3adb59c1ffd2325853e1d2fa3b0b36e3ec9759 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -6552,7 +6552,7 @@ nfs4_transform_lock_offset(struct file_lock *lock)
 }
 
 static fl_owner_t
-nfsd4_fl_get_owner(fl_owner_t owner)
+nfsd4_lm_get_owner(fl_owner_t owner)
 {
        struct nfs4_lockowner *lo = (struct nfs4_lockowner *)owner;
 
@@ -6561,7 +6561,7 @@ nfsd4_fl_get_owner(fl_owner_t owner)
 }
 
 static void
-nfsd4_fl_put_owner(fl_owner_t owner)
+nfsd4_lm_put_owner(fl_owner_t owner)
 {
        struct nfs4_lockowner *lo = (struct nfs4_lockowner *)owner;
 
@@ -6596,8 +6596,8 @@ nfsd4_lm_notify(struct file_lock *fl)
 
 static const struct lock_manager_operations nfsd_posix_mng_ops  = {
        .lm_notify = nfsd4_lm_notify,
-       .lm_get_owner = nfsd4_fl_get_owner,
-       .lm_put_owner = nfsd4_fl_put_owner,
+       .lm_get_owner = nfsd4_lm_get_owner,
+       .lm_put_owner = nfsd4_lm_put_owner,
 };
 
 static inline void