diff --git a/[refs] b/[refs]
index ba0912b9724f..cf5e0eaa0a18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3227fa41abc191384fa81b3bcf52aa7fccb31536
+refs/heads/master: f2ca7153ca49a407ea1c7232c9fa7e9849f03f9c
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index c64d55f319bd..18ac20ffedd2 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -358,10 +358,12 @@ static struct svc_export *svc_export_lookup(struct svc_export *);
 static int check_export(struct inode *inode, int flags, unsigned char *uuid)
 {
 
-	/* We currently export only dirs and regular files.
-	 * This is what umountd does.
+	/*
+	 * We currently export only dirs, regular files, and (for v4
+	 * pseudoroot) symlinks.
 	 */
 	if (!S_ISDIR(inode->i_mode) &&
+	    !S_ISLNK(inode->i_mode) &&
 	    !S_ISREG(inode->i_mode))
 		return -ENOTDIR;