From b47fed11247a5d8e676e3603a064e3a18bfb60ff Mon Sep 17 00:00:00 2001 From: Vitaliy Gusev Date: Wed, 15 Feb 2012 19:38:25 +0400 Subject: [PATCH] --- yaml --- r: 294483 b: refs/heads/master c: b4b9a0c1c89464dabafef974960f509ce33ae1c0 h: refs/heads/master i: 294481: 27aa35b50e40b261baecfa39580adfc9de782647 294479: e706c0907791d6ce35c4d49b55a946917c0ac225 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4proc.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3f45d3fbd41a..59e7485c5672 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 571b7554016941ef0f0c3c61be72561e2bc55f5e +refs/heads/master: b4b9a0c1c89464dabafef974960f509ce33ae1c0 diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index 0b3316541734..87c584dd88b1 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -5287,6 +5287,8 @@ static int nfs4_verify_fore_channel_attrs(struct nfs41_create_session_args *args return -EINVAL; if (rcvd->max_reqs == 0) return -EINVAL; + if (rcvd->max_reqs > NFS4_MAX_SLOT_TABLE) + rcvd->max_reqs = NFS4_MAX_SLOT_TABLE; return 0; } @@ -5302,9 +5304,9 @@ static int nfs4_verify_back_channel_attrs(struct nfs41_create_session_args *args if (rcvd->max_resp_sz_cached > sent->max_resp_sz_cached) return -EINVAL; /* These would render the backchannel useless: */ - if (rcvd->max_ops == 0) + if (rcvd->max_ops != sent->max_ops) return -EINVAL; - if (rcvd->max_reqs == 0) + if (rcvd->max_reqs != sent->max_reqs) return -EINVAL; return 0; }