diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
| commit | 33175d84ee3fa29991adb80513683e010769e807 (patch) | |
| tree | 3731f61cf82451b6892cf1368701e57e35d92908 /fs/nfsd/nfs4xdr.c | |
| parent | c5908939b2738bafe1b309bc2465cb9f2e6184c5 (diff) | |
| parent | 6dfbd87a20a737641ef228230c77f4262434fa24 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_cmn.c
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, | |||
| 1142 | 1142 | ||
| 1143 | u32 dummy; | 1143 | u32 dummy; |
| 1144 | char *machine_name; | 1144 | char *machine_name; |
| 1145 | int i; | 1145 | int i, j; |
| 1146 | int nr_secflavs; | 1146 | int nr_secflavs; |
| 1147 | 1147 | ||
| 1148 | READ_BUF(16); | 1148 | READ_BUF(16); |
| @@ -1215,7 +1215,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp, | |||
| 1215 | READ_BUF(4); | 1215 | READ_BUF(4); |
| 1216 | READ32(dummy); | 1216 | READ32(dummy); |
| 1217 | READ_BUF(dummy * 4); | 1217 | READ_BUF(dummy * 4); |
| 1218 | for (i = 0; i < dummy; ++i) | 1218 | for (j = 0; j < dummy; ++j) |
| 1219 | READ32(dummy); | 1219 | READ32(dummy); |
| 1220 | break; | 1220 | break; |
| 1221 | case RPC_AUTH_GSS: | 1221 | case RPC_AUTH_GSS: |