tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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_*

Linus Torvalds ee715087 68ac01a2

+4 -4
unified split
+4 -4
fs/nfsd/nfs4xdr.c
··· 317 317 READ_BUF(dummy32); 318 318 len += (XDR_QUADLEN(dummy32) << 2); 319 319 READMEM(buf, dummy32); 320 - if ((host_err = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid))) 321 - goto out_nfserr; 320 + if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid))) 321 + return status; 322 322 iattr->ia_valid |= ATTR_UID; 323 323 } 324 324 if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) { ··· 328 328 READ_BUF(dummy32); 329 329 len += (XDR_QUADLEN(dummy32) << 2); 330 330 READMEM(buf, dummy32); 331 - if ((host_err = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid))) 332 - goto out_nfserr; 331 + if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid))) 332 + return status; 333 333 iattr->ia_valid |= ATTR_GID; 334 334 } 335 335 if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {