nfsd: cleanup free_stid
Subsystems (2)
PATCH 1/1 nfsd: cleanup free_stid
Make it symmetric to alloc_stid
Signed-off-by Benny Halevy <[email protected]>
--- fs/nfsd/nfs4state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/nfsd/nfs4state.c +7 -2
@@ -402,11 +402,16 @@ static void remove_stid(struct nfs4_stid *s)idr_remove (stateids, s->sc_stateid.si_opaque.so_id); } +static void free_stid (struct kmem_cache *slab,struct nfs4_stid *s) +{ +kmem_cache_free (slab, s); +} +void nfs4_put_delegation (struct nfs4_delegation *dp) {if (atomic_dec_and_test (&dp->dl_count)) { -kmem_cache_free (deleg_slab, dp); +free_stid (deleg_slab, &dp->dl_stid); num_delegations--; } }
@@ -610,7 +615,7 @@ static void close_generic_stateid(struct nfs4_ol_stateid *stp)static void free_generic_stateid (struct nfs4_ol_stateid *stp) {remove_stid (&stp->st_stid); -kmem_cache_free (stateid_slab, stp); +free_stid (stateid_slab, &stp->st_stid); }static void release_lock_stateid (struct nfs4_ol_stateid *stp)
Signature · 1 line
1.8.3.1
PATCH v2 1/1 nfsd: nfs4_free_stid
Make it symmetric to nfs4_alloc_stid.
Signed-off-by Benny Halevy <[email protected]>
--- fs/nfsd/nfs4state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/nfsd/nfs4state.c +7 -2
@@ -402,11 +402,16 @@ static void remove_stid(struct nfs4_stid *s)idr_remove (stateids, s->sc_stateid.si_opaque.so_id); } +static void nfs4_free_stid (struct kmem_cache *slab,struct nfs4_stid *s) +{ +kmem_cache_free (slab, s); +} +void nfs4_put_delegation (struct nfs4_delegation *dp) {if (atomic_dec_and_test (&dp->dl_count)) { -kmem_cache_free (deleg_slab, dp); +nfs4_free_stid (deleg_slab, &dp->dl_stid); num_delegations--; } }
@@ -610,7 +615,7 @@ static void close_generic_stateid(struct nfs4_ol_stateid *stp)static void free_generic_stateid (struct nfs4_ol_stateid *stp) {remove_stid (&stp->st_stid); -kmem_cache_free (stateid_slab, stp); +nfs4_free_stid (stateid_slab, &stp->st_stid); }static void release_lock_stateid (struct nfs4_ol_stateid *stp)
Signature · 1 line
1.8.3.1
Re: [PATCH v2] nfsd: nfs4_free_stid
Quoted 1 line · Benny Halevy
Make it symmetric to
nfs4_alloc_stid.
OK, applying.--b.
Quoted 40 lines
Signed-off-by Benny Halevy <[email protected]>--- fs/nfsd/nfs4state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)fs/nfsd/nfs4state.c +7
-2@@ -402,11 +402,16 @@ static void remove_stid(struct nfs4_stid *s)idr_remove (stateids, s->sc_stateid.si_opaque.so_id); } +static void nfs4_free_stid (struct kmem_cache *slab,struct nfs4_stid *s) +{ +kmem_cache_free (slab, s); +} +void nfs4_put_delegation (struct nfs4_delegation *dp) {if (atomic_dec_and_test (&dp->dl_count)) { -kmem_cache_free (deleg_slab, dp); +nfs4_free_stid (deleg_slab, &dp->dl_stid); num_delegations--; } }@@ -610,7 +615,7 @@ static void close_generic_stateid(struct nfs4_ol_stateid *stp)static void free_generic_stateid (struct nfs4_ol_stateid *stp) {remove_stid (&stp->st_stid); -kmem_cache_free (stateid_slab, stp); +nfs4_free_stid (stateid_slab, &stp->st_stid); }static void release_lock_stateid (struct nfs4_ol_stateid *stp)Signature · 1 line
1.8.3.1