Commit 35aff067 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Clean up _lm_ operation names 



The common practice is to name function instances the same as the
method names, but with a uniquifying prefix. Commit aef9583b
("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: default avatarChuck Lever <chuck.lever@oracle.com>
parent f3e4080e

fs/nfsd/nfs4state.c

+4 −4
Original line number Diff line number Diff line
@@ -6526,7 +6526,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;
@@ -6535,7 +6535,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;
@@ -6570,8 +6570,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