summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-02-22 23:58:31 +0100
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-02-22 23:58:31 +0100
commitcc1f9000eaf6d98f91602c49f1ceed54f965cc43 (patch)
tree4146ea3903071b30b9f20406731841e663ac3b11 /fs/nfs/nfs4proc.c
parentNFSv4.x/pnfs: Fix a race between layoutget and bulk recalls (diff)
parentNFSv4.x: Fix NFS4ERR_RETRY_UNCACHED_REP in nfs4_callback_sequence (diff)
downloadlinux-cc1f9000eaf6d98f91602c49f1ceed54f965cc43.tar.xz
linux-cc1f9000eaf6d98f91602c49f1ceed54f965cc43.zip
Merge branch 'nfsv41_cb'
* nfsv41_cb: NFSv4.x: Fix NFS4ERR_RETRY_UNCACHED_REP in nfs4_callback_sequence NFSv4.x: Allow multiple callbacks in flight NFSv4.x: Fix wraparound issues when validing the callback sequence id NFSv4.x: Enforce the ca_maxresponsesize_cached on the back channel NFSv4.x: CB_SEQUENCE should return NFS4ERR_DELAY if still executing NFSv4.x: Remove hard coded slotids in callback channel
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 14881594dd07..1e103b4f4ad7 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7319,7 +7319,7 @@ static void nfs4_init_channel_attrs(struct nfs41_create_session_args *args)
args->bc_attrs.max_resp_sz = PAGE_SIZE;
args->bc_attrs.max_resp_sz_cached = 0;
args->bc_attrs.max_ops = NFS4_MAX_BACK_CHANNEL_OPS;
- args->bc_attrs.max_reqs = 1;
+ args->bc_attrs.max_reqs = NFS41_BC_MAX_CALLBACKS;
dprintk("%s: Back Channel : max_rqst_sz=%u max_resp_sz=%u "
"max_resp_sz_cached=%u max_ops=%u max_reqs=%u\n",