diff options
| author | Andy Adamson <andros@netapp.com> | 2009-08-27 12:07:40 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-28 12:20:15 -0400 |
| commit | 468de9e54a900559b55aa939a4daeaea1915e572 (patch) | |
| tree | fa9f57f48f7f136fc5e4d821454ffb47ec0c22f6 /include/linux/nfsd/xdr4.h | |
| parent | d8d0b85b11476ce59684ad2998e91a522df518a0 (diff) | |
| download | linux-468de9e54a900559b55aa939a4daeaea1915e572.tar.gz linux-468de9e54a900559b55aa939a4daeaea1915e572.tar.bz2 linux-468de9e54a900559b55aa939a4daeaea1915e572.zip | |
nfsd41: expand solo sequence check
Compounds consisting of only a sequence operation don't need any
additional caching beyond the sequence information we store in the slot
entry. Fix nfsd4_is_solo_sequence to identify this case correctly.
The additional check for a failed sequence in nfsd4_store_cache_entry()
is redundant, since the nfsd4_is_solo_sequence call lower down catches
this case.
The final ce_cachethis set in nfsd4_sequence is also redundant.
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/nfsd/xdr4.h')
| -rw-r--r-- | include/linux/nfsd/xdr4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h index 5e4beb0deb80..3f716607c86d 100644 --- a/include/linux/nfsd/xdr4.h +++ b/include/linux/nfsd/xdr4.h @@ -467,7 +467,7 @@ struct nfsd4_compoundres { static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp) { struct nfsd4_compoundargs *args = resp->rqstp->rq_argp; - return args->opcnt == 1; + return resp->opcnt == 1 && args->ops[0].opnum == OP_SEQUENCE; } static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp) |