From 7e262cf830edb5d42c504d5309f6e4ad12ecfd27 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 6 Feb 2012 15:18:48 -0500 Subject: [PATCH] --- yaml --- r: 294444 b: refs/heads/master c: 883381246c5ac2c29b849fe619f55fa5961ee76d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/nfs_fs_sb.h | 2 +- trunk/include/linux/sunrpc/xprt.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b4cfef4179f4..1672696bcccc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5753cba17611af108995672c4e2d978014e17a56 +refs/heads/master: 883381246c5ac2c29b849fe619f55fa5961ee76d diff --git a/trunk/include/linux/nfs_fs_sb.h b/trunk/include/linux/nfs_fs_sb.h index c23469308b8e..9e101c1b81cf 100644 --- a/trunk/include/linux/nfs_fs_sb.h +++ b/trunk/include/linux/nfs_fs_sb.h @@ -190,7 +190,7 @@ struct nfs_server { /* maximum number of slots to use */ -#define NFS4_MAX_SLOT_TABLE RPC_MAX_SLOT_TABLE +#define NFS4_MAX_SLOT_TABLE (128U) #if defined(CONFIG_NFS_V4) diff --git a/trunk/include/linux/sunrpc/xprt.h b/trunk/include/linux/sunrpc/xprt.h index 15518a152ac3..b033f366d5f6 100644 --- a/trunk/include/linux/sunrpc/xprt.h +++ b/trunk/include/linux/sunrpc/xprt.h @@ -21,8 +21,8 @@ #define RPC_MIN_SLOT_TABLE (2U) #define RPC_DEF_SLOT_TABLE (16U) -#define RPC_MAX_SLOT_TABLE (128U) #define RPC_MAX_SLOT_TABLE_LIMIT (65536U) +#define RPC_MAX_SLOT_TABLE RPC_MAX_SLOT_TABLE_LIMIT /* * This describes a timeout strategy