nfsd4: rearrange struct nfsd4_slot

Combine two booleans into a single flag field, move the smaller fields
to the end.

(In practice this doesn't make the struct any smaller.  But we'll be
adding another flag here soon.)

Remove some debugging code that doesn't look useful, while we're in the
neighborhood.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index ffb5df1db94f..122217fe9155 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -128,12 +128,13 @@ static inline struct nfs4_delegation *delegstateid(struct nfs4_stid *s)
                 (NFSD_CACHE_SIZE_SLOTS_PER_SESSION * NFSD_SLOT_CACHE_SIZE)
 
 struct nfsd4_slot {
-        bool    sl_inuse;
-        bool    sl_cachethis;
-        u16     sl_opcnt;
         u32     sl_seqid;
         __be32  sl_status;
         u32     sl_datalen;
+        u16     sl_opcnt;
+#define NFSD4_SLOT_INUSE        (1 << 0)
+#define NFSD4_SLOT_CACHETHIS    (1 << 1)
+        u8      sl_flags;
         char    sl_data[];
 };