diff --git a/[refs] b/[refs]
index ef26255abfec..3438a7ae4cbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a56f39375a7bd183149c18286389e4a58ac9bc95
+refs/heads/master: 4bdff8c0950afa6a3f2efec6cd15159d97fac1e6
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index 3eec30000f3f..01bc68c628ad 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -126,7 +126,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
 	if (*ep)
 		goto out;
 	dprintk("found fsidtype %d\n", fsidtype);
-	if (fsidtype > 2)
+	if (key_len(fsidtype)==0) /* invalid type */
 		goto out;
 	if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
 		goto out;