diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-08-29 13:32:54 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-09-10 17:46:17 -0400 |
commit | ef79859e04bd67638f72373bb5514211d6f6d5b3 (patch) | |
tree | 2dca79b9c592dff41a88748529da5f66f51510ae /fs/nfsd/nfs4state.c | |
parent | 92566e287d5211774f9466e35d7b7240532521e6 (diff) |
nfsd4: eliminate redundant nfs4_free_stateid
Somehow we ended up with identical functions "nfs4_free_stateid" and
"free_generic_stateid".
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6686e747223f..5122e1704cd4 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2705,11 +2705,6 @@ nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_ol_st | |||
2705 | return nfs_ok; | 2705 | return nfs_ok; |
2706 | } | 2706 | } |
2707 | 2707 | ||
2708 | static void nfs4_free_stateid(struct nfs4_ol_stateid *s) | ||
2709 | { | ||
2710 | kmem_cache_free(stateid_slab, s); | ||
2711 | } | ||
2712 | |||
2713 | static inline int nfs4_access_to_access(u32 nfs4_access) | 2708 | static inline int nfs4_access_to_access(u32 nfs4_access) |
2714 | { | 2709 | { |
2715 | int flags = 0; | 2710 | int flags = 0; |
@@ -3088,7 +3083,7 @@ void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status) | |||
3088 | if (open->op_file) | 3083 | if (open->op_file) |
3089 | nfsd4_free_file(open->op_file); | 3084 | nfsd4_free_file(open->op_file); |
3090 | if (open->op_stp) | 3085 | if (open->op_stp) |
3091 | nfs4_free_stateid(open->op_stp); | 3086 | free_generic_stateid(open->op_stp); |
3092 | } | 3087 | } |
3093 | 3088 | ||
3094 | __be32 | 3089 | __be32 |