[PATCH 26/30] nfsd41: use the maximum operations per compound in nfsd4_compoundargs

andros
2009-06-08T18:21:39Z

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 | 3 +--
include/linux/nfsd/xdr4.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index f2ccb64..7dfd01a 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -101,8 +101,7 @@ struct nfs4_callback {

#define NFSD_MAX_SLOTS_PER_SESSION 16
#define NFSD_SLOT_CACHE_SIZE 512
-/* Maximum number of operations per session compound */
-#define NFSD_MAX_OPS_PER_COMPOUND 16
+#define NFSD_MAX_OPS_PER_COMPOUND 8

struct nfsd4_slot {
bool sl_inuse;
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 505e3e3..026d3a5 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -443,7 +443,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