diff options
author | Weston Andros Adamson <dros@netapp.com> | 2011-05-31 19:05:47 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-12 13:40:27 -0400 |
commit | 78fe0f41d9937ee62817912ac8d627e06243c269 (patch) | |
tree | 7ae4ac3f9675ecbddb5ec0c4615313ae899c10da /fs/nfs/nfs4xdr.c | |
parent | 7e574f0d3911c5cc60d4d2b57fee975c462d6cd0 (diff) |
NFS: use scope from exchange_id to skip reclaim
can be skipped if the "eir_server_scope" from the exchange_id proc differs from
previous calls.
Also, in the future server_scope will be useful for determining whether client
trunking is available
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index e6e8f3b9a1de..1555c74dd336 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -4977,11 +4977,17 @@ static int decode_exchange_id(struct xdr_stream *xdr, | |||
4977 | if (unlikely(status)) | 4977 | if (unlikely(status)) |
4978 | return status; | 4978 | return status; |
4979 | 4979 | ||
4980 | /* Throw away server_scope */ | 4980 | /* Save server_scope */ |
4981 | status = decode_opaque_inline(xdr, &dummy, &dummy_str); | 4981 | status = decode_opaque_inline(xdr, &dummy, &dummy_str); |
4982 | if (unlikely(status)) | 4982 | if (unlikely(status)) |
4983 | return status; | 4983 | return status; |
4984 | 4984 | ||
4985 | if (unlikely(dummy > NFS4_OPAQUE_LIMIT)) | ||
4986 | return -EIO; | ||
4987 | |||
4988 | memcpy(res->server_scope->server_scope, dummy_str, dummy); | ||
4989 | res->server_scope->server_scope_sz = dummy; | ||
4990 | |||
4985 | /* Throw away Implementation id array */ | 4991 | /* Throw away Implementation id array */ |
4986 | status = decode_opaque_inline(xdr, &dummy, &dummy_str); | 4992 | status = decode_opaque_inline(xdr, &dummy, &dummy_str); |
4987 | if (unlikely(status)) | 4993 | if (unlikely(status)) |