korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] nfsd4: Fix bug in rdattr_error return

Browse Source 
Fix bug in rdattr_error return which causes correct error code to be
overwritten by nfserr_toosmall.

Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Fred Isaman 2006-01-18 17:43:40 -08:00 committed by Linus Torvalds
parent 6c26d08f02
commit 34081efc12
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfsd/nfs4xdr.c
View File

@ -1764,10 +1764,11 @@ nfsd4_encode_dirent(struct readdir_cd *ccd, const char *name, int namlen,
*/ */
if (!(cd->rd_bmval[0] & FATTR4_WORD0_RDATTR_ERROR)) if (!(cd->rd_bmval[0] & FATTR4_WORD0_RDATTR_ERROR))
goto fail; goto fail;
nfserr = nfserr_toosmall;
p = nfsd4_encode_rdattr_error(p, buflen, nfserr); p = nfsd4_encode_rdattr_error(p, buflen, nfserr);
if (p == NULL) if (p == NULL) {
nfserr = nfserr_toosmall;
goto fail; goto fail;
}
} }
cd->buflen -= (p - cd->buffer); cd->buflen -= (p - cd->buffer);
cd->buffer = p; cd->buffer = p;