nfsd4: split out some free_generic_stateid code

We'll use this elsewhere.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 567130dccda0680b8eeefa6e8158a354abfadad9..c28432a802102fd33d765f7b0f7d264ec19b01d9 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -411,7 +411,7 @@ static void unhash_generic_stateid(struct nfs4_stateid *stp)
        list_del(&stp->st_perstateowner);
 }
 
-static void free_generic_stateid(struct nfs4_stateid *stp)
+static void close_generic_stateid(struct nfs4_stateid *stp)
 {
        int i;
 
@@ -420,9 +420,16 @@ static void free_generic_stateid(struct nfs4_stateid *stp)
                        if (test_bit(i, &stp->st_access_bmap))
                                nfs4_file_put_access(stp->st_file,
                                                nfs4_access_to_omode(i));
+                       __clear_bit(i, &stp->st_access_bmap);
                }
        }
        put_nfs4_file(stp->st_file);
+       stp->st_file = NULL;
+}
+
+static void free_generic_stateid(struct nfs4_stateid *stp)
+{
+       close_generic_stateid(stp);
        kmem_cache_free(stateid_slab, stp);
 }