commit 48c348b09c6b35b1cf6f2125d1d4fd7c962dd79d
author Kinglong Mee <kinglongmee@gmail.com> Tue Sep 02 22:13:32 2014 +0800
committer J. Bruce Fields <bfields@redhat.com> Wed Sep 03 17:43:02 2014 -0400
tree 1bd8f80bd60e47e34b91cd1ca319976d24e16923
parent 15d176c195b164db59dd4473a0cfb1ad0bfbd0a4

NFSD: Fix bad using of return value from qword_get

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

fs/nfsd/nfs4idmap.c

diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index a0ab0a8..dc948f6 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -368,7 +368,7 @@
 {
 	struct ent ent, *res;
 	char *buf1;
-	int error = -EINVAL;
+	int len, error = -EINVAL;
 
 	if (buf[buflen - 1] != '\n')
 		return (-EINVAL);
@@ -392,8 +392,8 @@
 		IDMAP_TYPE_USER : IDMAP_TYPE_GROUP;
 
 	/* Name */
-	error = qword_get(&buf, buf1, PAGE_SIZE);
-	if (error <= 0 || error >= IDMAP_NAMESZ)
+	len = qword_get(&buf, buf1, PAGE_SIZE);
+	if (len <= 0 || len >= IDMAP_NAMESZ)
 		goto out;
 	memcpy(ent.name, buf1, sizeof(ent.name));