[PATCH 25/29] nfsd41: use the maximum operations per compound in nfsd4_compoundargs

andros
2009-04-23T16:43:34Z

The size of the nfsd4_op array in nfsd4_compoundargs determines the
supported maximum number of operations.

Signed-off-by: Andy Adamson <andros@netapp.com>
---
include/linux/nfsd/state.h | 2 +-
include/linux/nfsd/xdr4.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 0dfdb6e..d65ce6f 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -112,7 +112,7 @@ struct nfs4_callback {
/* Size of each slot cache entry */
#define NFSD_SLOT_CACHE_SIZE 1024
/* Maximum number of operations per session compound */
-#define NFSD_MAX_OPS_PER_COMPOUND 16
+#define NFSD_MAX_OPS_PER_COMPOUND 8

struct nfsd4_cache_entry {
__be32 ce_status;
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 45ccbc3..e312601 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -455,7 +455,7 @@ struct nfsd4_compoundargs {
u32 minorversion;
u32 opcnt;
struct nfsd4_op *ops;
- struct nfsd4_op iops[8];
+ struct nfsd4_op iops[NFSD_MAX_OPS_PER_COMPOUND];
};

struct nfsd4_compoundres {
--
1.5.4.3