diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 00:53:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 00:53:41 -0500 |
| commit | ee715087024b91a6ceb85ba2d02f6c35d354a48c (patch) | |
| tree | 9f6bdcd5932d35eb9f15ae3dd647c6f5063873a4 /fs | |
| parent | 68ac01a2de5faed5e19a78c06314804c6184a650 (diff) | |
| parent | 47c85291d3dd1a51501555000b90f8e281a0458e (diff) | |
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
nfsd: correctly handle return value from nfsd_map_name_to_*
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 956629b9cdc9..1275b8655070 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
| @@ -317,8 +317,8 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, | |||
| 317 | READ_BUF(dummy32); | 317 | READ_BUF(dummy32); |
| 318 | len += (XDR_QUADLEN(dummy32) << 2); | 318 | len += (XDR_QUADLEN(dummy32) << 2); |
| 319 | READMEM(buf, dummy32); | 319 | READMEM(buf, dummy32); |
| 320 | if ((host_err = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid))) | 320 | if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid))) |
| 321 | goto out_nfserr; | 321 | return status; |
| 322 | iattr->ia_valid |= ATTR_UID; | 322 | iattr->ia_valid |= ATTR_UID; |
| 323 | } | 323 | } |
| 324 | if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) { | 324 | if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) { |
| @@ -328,8 +328,8 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, | |||
| 328 | READ_BUF(dummy32); | 328 | READ_BUF(dummy32); |
| 329 | len += (XDR_QUADLEN(dummy32) << 2); | 329 | len += (XDR_QUADLEN(dummy32) << 2); |
| 330 | READMEM(buf, dummy32); | 330 | READMEM(buf, dummy32); |
| 331 | if ((host_err = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid))) | 331 | if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid))) |
| 332 | goto out_nfserr; | 332 | return status; |
| 333 | iattr->ia_valid |= ATTR_GID; | 333 | iattr->ia_valid |= ATTR_GID; |
| 334 | } | 334 | } |
| 335 | if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) { | 335 | if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) { |