From 4ae098d327c599c9a8e2eecedcc2c192b537ff4e Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Tue, 29 Jul 2014 21:34:43 -0400 Subject: [PATCH] nfsd: rename unhash_generic_stateid to unhash_ol_stateid ...to better match other functions that deal with open/lock stateids. Signed-off-by: Jeff Layton Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1f67a96c4941..52ec47de1185 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -949,7 +949,7 @@ static void nfs4_put_stateowner(struct nfs4_stateowner *sop) sop->so_ops->so_free(sop); } -static void unhash_generic_stateid(struct nfs4_ol_stateid *stp) +static void unhash_ol_stateid(struct nfs4_ol_stateid *stp) { struct nfs4_file *fp = stp->st_stid.sc_file; @@ -1014,7 +1014,7 @@ static void unhash_lock_stateid(struct nfs4_ol_stateid *stp) lockdep_assert_held(&oo->oo_owner.so_client->cl_lock); list_del_init(&stp->st_locks); - unhash_generic_stateid(stp); + unhash_ol_stateid(stp); unhash_stid(&stp->st_stid); } @@ -1095,7 +1095,7 @@ static void unhash_open_stateid(struct nfs4_ol_stateid *stp, { lockdep_assert_held(&stp->st_stid.sc_client->cl_lock); - unhash_generic_stateid(stp); + unhash_ol_stateid(stp); release_open_stateid_locks(stp, reaplist); } -- 2.20.1