path: root/fs/nfsd/xdr4.h
diff options
authorJ. Bruce Fields <bfields@redhat.com>2012-02-13 16:39:00 -0500
committerJ. Bruce Fields <bfields@redhat.com>2012-02-14 17:01:29 -0500
commit73e79482b40fb6671915e3da0d178862a07ef254 (patch)
tree15a12f909e7c4c6ba1691c3d1448ec42a9b65d5a /fs/nfsd/xdr4.h
parentf6d82485e9a947ae19bb29e72644f4c6f27d5b89 (diff)
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/xdr4.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 2364747ee97..21dccdfcb7a 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -503,7 +503,8 @@ static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)
static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp)
- return !resp->cstate.slot->sl_cachethis || nfsd4_is_solo_sequence(resp);
+ return !(resp->cstate.slot->sl_flags & NFSD4_SLOT_CACHETHIS)
+ || nfsd4_is_solo_sequence(resp);
#define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs)