summaryrefslogtreecommitdiff
path: root/fs/nfsd/state.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-02-14 01:39:00 +0400
committerJ. Bruce Fields <bfields@redhat.com>2012-02-15 02:01:29 +0400
commit73e79482b40fb6671915e3da0d178862a07ef254 (patch)
tree15a12f909e7c4c6ba1691c3d1448ec42a9b65d5a /fs/nfsd/state.h
parentf6d82485e9a947ae19bb29e72644f4c6f27d5b89 (diff)
downloadlinux-73e79482b40fb6671915e3da0d178862a07ef254.tar.xz
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>
Diffstat (limited to 'fs/nfsd/state.h')
-rw-r--r--fs/nfsd/state.h7
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[];
};