Skip to content

Commit 35aff06

Browse files
committed
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 aef9583 ("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>
1 parent f3e4080 commit 35aff06

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

fs/nfsd/nfs4state.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6526,7 +6526,7 @@ nfs4_transform_lock_offset(struct file_lock *lock)
65266526
}
65276527

65286528
static fl_owner_t
6529-
nfsd4_fl_get_owner(fl_owner_t owner)
6529+
nfsd4_lm_get_owner(fl_owner_t owner)
65306530
{
65316531
struct nfs4_lockowner *lo = (struct nfs4_lockowner *)owner;
65326532

@@ -6535,7 +6535,7 @@ nfsd4_fl_get_owner(fl_owner_t owner)
65356535
}
65366536

65376537
static void
6538-
nfsd4_fl_put_owner(fl_owner_t owner)
6538+
nfsd4_lm_put_owner(fl_owner_t owner)
65396539
{
65406540
struct nfs4_lockowner *lo = (struct nfs4_lockowner *)owner;
65416541

@@ -6570,8 +6570,8 @@ nfsd4_lm_notify(struct file_lock *fl)
65706570

65716571
static const struct lock_manager_operations nfsd_posix_mng_ops = {
65726572
.lm_notify = nfsd4_lm_notify,
6573-
.lm_get_owner = nfsd4_fl_get_owner,
6574-
.lm_put_owner = nfsd4_fl_put_owner,
6573+
.lm_get_owner = nfsd4_lm_get_owner,
6574+
.lm_put_owner = nfsd4_lm_put_owner,
65756575
};
65766576

65776577
static inline void

0 commit comments

Comments
 (0)