Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34081efc authored by Fred Isaman's avatar Fred Isaman Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: Fix bug in rdattr_error return 



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

Signed-off-by: default avatarFred Isaman <iisaman@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6c26d08f

fs/nfsd/nfs4xdr.c

+3 −2
Original line number Diff line number Diff line
@@ -1764,11 +1764,12 @@ nfsd4_encode_dirent(struct readdir_cd *ccd, const char *name, int namlen, 
		 */

		if (!(cd->rd_bmval[0] & FATTR4_WORD0_RDATTR_ERROR))

			goto fail;

		nfserr = nfserr_toosmall;

		p = nfsd4_encode_rdattr_error(p, buflen, nfserr);

		if (p == NULL)

		if (p == NULL) {

			nfserr = nfserr_toosmall;

			goto fail;

		}

	}

	cd->buflen -= (p - cd->buffer);

	cd->buffer = p;

	cd->common.err = nfs_ok;