diff options
author | Jeff Layton <jlayton@primarydata.com> | 2014-07-29 21:34:43 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-07-31 14:20:31 -0400 |
commit | 4ae098d327c599c9a8e2eecedcc2c192b537ff4e (patch) | |
tree | 549089f5576cd88e6e8d51d76d34a8bca3e0a478 /fs/nfsd | |
parent | d83017f94c290c56010e194cdbc45e59894ccae2 (diff) |
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 <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files 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) | |||
949 | sop->so_ops->so_free(sop); | 949 | sop->so_ops->so_free(sop); |
950 | } | 950 | } |
951 | 951 | ||
952 | static void unhash_generic_stateid(struct nfs4_ol_stateid *stp) | 952 | static void unhash_ol_stateid(struct nfs4_ol_stateid *stp) |
953 | { | 953 | { |
954 | struct nfs4_file *fp = stp->st_stid.sc_file; | 954 | struct nfs4_file *fp = stp->st_stid.sc_file; |
955 | 955 | ||
@@ -1014,7 +1014,7 @@ static void unhash_lock_stateid(struct nfs4_ol_stateid *stp) | |||
1014 | lockdep_assert_held(&oo->oo_owner.so_client->cl_lock); | 1014 | lockdep_assert_held(&oo->oo_owner.so_client->cl_lock); |
1015 | 1015 | ||
1016 | list_del_init(&stp->st_locks); | 1016 | list_del_init(&stp->st_locks); |
1017 | unhash_generic_stateid(stp); | 1017 | unhash_ol_stateid(stp); |
1018 | unhash_stid(&stp->st_stid); | 1018 | unhash_stid(&stp->st_stid); |
1019 | } | 1019 | } |
1020 | 1020 | ||
@@ -1095,7 +1095,7 @@ static void unhash_open_stateid(struct nfs4_ol_stateid *stp, | |||
1095 | { | 1095 | { |
1096 | lockdep_assert_held(&stp->st_stid.sc_client->cl_lock); | 1096 | lockdep_assert_held(&stp->st_stid.sc_client->cl_lock); |
1097 | 1097 | ||
1098 | unhash_generic_stateid(stp); | 1098 | unhash_ol_stateid(stp); |
1099 | release_open_stateid_locks(stp, reaplist); | 1099 | release_open_stateid_locks(stp, reaplist); |
1100 | } | 1100 | } |
1101 | 1101 | ||