diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-08-29 19:32:54 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-09-10 23:46:17 +0200 |
| commit | ef79859e04bd67638f72373bb5514211d6f6d5b3 (patch) | |
| tree | 2dca79b9c592dff41a88748529da5f66f51510ae /fs/nfsd | |
| parent | fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR (diff) | |
| download | linux-ef79859e04bd67638f72373bb5514211d6f6d5b3.tar.xz linux-ef79859e04bd67638f72373bb5514211d6f6d5b3.zip | |
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')
| -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 return nfs_ok; } -static void nfs4_free_stateid(struct nfs4_ol_stateid *s) -{ - kmem_cache_free(stateid_slab, s); -} - static inline int nfs4_access_to_access(u32 nfs4_access) { int flags = 0; @@ -3088,7 +3083,7 @@ void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status) if (open->op_file) nfsd4_free_file(open->op_file); if (open->op_stp) - nfs4_free_stateid(open->op_stp); + free_generic_stateid(open->op_stp); } __be32 |