nfsd4: move some of nfs4_stateid into a separate structure

We want delegations to share more with open/lock stateid's, so first
we'll pull out some of the common stuff we want to share.

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

2 files changed, 106 insertions, 97 deletions

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 768382d1de97..d0bb5a5613a9 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -159,7 +159,7 @@ static struct list_head	open_ownerstr_hashtbl[OPEN_OWNER_HASH_SIZE];
 #define FILE_HASH_BITS                   8
 #define FILE_HASH_SIZE                  (1 << FILE_HASH_BITS)
 
-/* hash table for (open)nfs4_stateid */
+/* hash table for (open)nfs4_ol_stateid */
 #define STATEID_HASH_BITS              10
 #define STATEID_HASH_SIZE              (1 << STATEID_HASH_BITS)
 #define STATEID_HASH_MASK              (STATEID_HASH_SIZE - 1)
@@ -219,7 +219,7 @@ static void nfs4_file_put_access(struct nfs4_file *fp, int oflag)
 }
 
 static struct nfs4_delegation *
-alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_fh *current_fh, u32 type)
+alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct svc_fh *current_fh, u32 type)
 {
         struct nfs4_delegation *dp;
         struct nfs4_file *fp = stp->st_file;
@@ -380,7 +380,7 @@ set_deny(unsigned int *deny, unsigned long bmap) {
 }
 
 static int
-test_share(struct nfs4_stateid *stp, struct nfsd4_open *open) {
+test_share(struct nfs4_ol_stateid *stp, struct nfsd4_open *open) {
         unsigned int access, deny;
 
         set_access(&access, stp->st_access_bmap);
@@ -403,14 +403,14 @@ static int nfs4_access_to_omode(u32 access)
         BUG();
 }
 
-static void unhash_generic_stateid(struct nfs4_stateid *stp)
+static void unhash_generic_stateid(struct nfs4_ol_stateid *stp)
 {
-        list_del(&stp->st_hash);
+        list_del(&stp->st_stid.sc_hash);
         list_del(&stp->st_perfile);
         list_del(&stp->st_perstateowner);
 }
 
-static void close_generic_stateid(struct nfs4_stateid *stp)
+static void close_generic_stateid(struct nfs4_ol_stateid *stp)
 {
         int i;
 
@@ -426,13 +426,13 @@ static void close_generic_stateid(struct nfs4_stateid *stp)
         stp->st_file = NULL;
 }
 
-static void free_generic_stateid(struct nfs4_stateid *stp)
+static void free_generic_stateid(struct nfs4_ol_stateid *stp)
 {
         close_generic_stateid(stp);
         kmem_cache_free(stateid_slab, stp);
 }
 
-static void release_lock_stateid(struct nfs4_stateid *stp)
+static void release_lock_stateid(struct nfs4_ol_stateid *stp)
 {
         struct file *file;
 
@@ -445,14 +445,14 @@ static void release_lock_stateid(struct nfs4_stateid *stp)
 
 static void unhash_lockowner(struct nfs4_lockowner *lo)
 {
-        struct nfs4_stateid *stp;
+        struct nfs4_ol_stateid *stp;
 
         list_del(&lo->lo_owner.so_idhash);
         list_del(&lo->lo_owner.so_strhash);
         list_del(&lo->lo_perstateid);
         while (!list_empty(&lo->lo_owner.so_stateids)) {
                 stp = list_first_entry(&lo->lo_owner.so_stateids,
-                                struct nfs4_stateid, st_perstateowner);
+                                struct nfs4_ol_stateid, st_perstateowner);
                 release_lock_stateid(stp);
         }
 }
@@ -464,7 +464,7 @@ static void release_lockowner(struct nfs4_lockowner *lo)
 }
 
 static void
-release_stateid_lockowners(struct nfs4_stateid *open_stp)
+release_stateid_lockowners(struct nfs4_ol_stateid *open_stp)
 {
         struct nfs4_lockowner *lo;
 
@@ -475,7 +475,7 @@ release_stateid_lockowners(struct nfs4_stateid *open_stp)
         }
 }
 
-static void release_open_stateid(struct nfs4_stateid *stp)
+static void release_open_stateid(struct nfs4_ol_stateid *stp)
 {
         unhash_generic_stateid(stp);
         release_stateid_lockowners(stp);
@@ -484,14 +484,14 @@ static void release_open_stateid(struct nfs4_stateid *stp)
 
 static void unhash_openowner(struct nfs4_openowner *oo)
 {
-        struct nfs4_stateid *stp;
+        struct nfs4_ol_stateid *stp;
 
         list_del(&oo->oo_owner.so_idhash);
         list_del(&oo->oo_owner.so_strhash);
         list_del(&oo->oo_perclient);
         while (!list_empty(&oo->oo_owner.so_stateids)) {
                 stp = list_first_entry(&oo->oo_owner.so_stateids,
-                                struct nfs4_stateid, st_perstateowner);
+                                struct nfs4_ol_stateid, st_perstateowner);
                 release_open_stateid(stp);
         }
 }
@@ -1068,26 +1068,26 @@ same_stateid(stateid_t *id_one, stateid_t *id_two)
         return id_one->si_fileid == id_two->si_fileid;
 }
 
-static struct nfs4_stateid *find_stateid(stateid_t *t)
+static struct nfs4_ol_stateid *find_stateid(stateid_t *t)
 {
-        struct nfs4_stateid *s;
+        struct nfs4_stid *s;
         unsigned int hashval;
 
         hashval = stateid_hashval(t->si_stateownerid, t->si_fileid);
-        list_for_each_entry(s, &stateid_hashtbl[hashval], st_hash)
-                if (same_stateid(&s->st_stateid, t))
-                        return s;
+        list_for_each_entry(s, &stateid_hashtbl[hashval], sc_hash)
+                if (same_stateid(&s->sc_stateid, t))
+                        return openlockstateid(s);
         return NULL;
 }
 
-static struct nfs4_stateid *find_stateid_by_type(stateid_t *t, char typemask)
+static struct nfs4_ol_stateid *find_stateid_by_type(stateid_t *t, char typemask)
 {
-        struct nfs4_stateid *s;
+        struct nfs4_ol_stateid *s;
 
         s = find_stateid(t);
         if (!s)
                 return NULL;
-        if (typemask & s->st_type)
+        if (typemask & s->st_stid.sc_type)
                 return s;
         return NULL;
 }
@@ -2232,7 +2232,7 @@ nfsd4_init_slabs(void)
         if (file_slab == NULL)
                 goto out_nomem;
         stateid_slab = kmem_cache_create("nfsd4_stateids",
-                        sizeof(struct nfs4_stateid), 0, 0, NULL);
+                        sizeof(struct nfs4_ol_stateid), 0, 0, NULL);
         if (stateid_slab == NULL)
                 goto out_nomem;
         deleg_slab = kmem_cache_create("nfsd4_delegations",
@@ -2314,23 +2314,23 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfs4_client *clp, str
 }