diff options
author | J. Bruce Fields <bfields@redhat.com> | 2011-03-17 18:07:20 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2011-03-17 18:07:25 +0100 |
commit | cf507b6f8ebae89c0e7bbd00abc6d8887c9035b1 (patch) | |
tree | 834a5c5bbd63aed0756d47978679d230d5dedec4 /fs/nfsd/nfs4xdr.c | |
parent | nfsd4: fix comment and remove unused nfsd4_file fields (diff) | |
parent | nfsd: wrong index used in inner loop (diff) | |
download | linux-cf507b6f8ebae89c0e7bbd00abc6d8887c9035b1.tar.xz linux-cf507b6f8ebae89c0e7bbd00abc6d8887c9035b1.zip |
Merge create_session decoding fix into for-2.6.39
This needs a further fixup!
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
-rw-r--r-- | fs/nfsd/nfs4xdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 1275b8655070..615f0a9f0600 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1142,7 +1142,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp, u32 dummy; char *machine_name; - int i; + int i, j; int nr_secflavs; READ_BUF(16); @@ -1215,7 +1215,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp, READ_BUF(4); READ32(dummy); READ_BUF(dummy * 4); - for (i = 0; i < dummy; ++i) + for (j = 0; j < dummy; ++j) READ32(dummy); break; case RPC_AUTH_GSS: |