diff --git a/[refs] b/[refs]
index 93d1e7b1490c..a046cc0f197d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57101991156aaba97c630f38e880f0d4012edcd
+refs/heads/master: 4b41bd85d5f93af37c2730df172aeb54280be7c3
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index f37df46d2eaa..0747bb5ffcf1 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -1104,6 +1104,10 @@ exp_rootfh(svc_client *clp, char *path, struct knfsd_fh *f, int maxsize)
 		 path, nd.dentry, clp->name,
 		 inode->i_sb->s_id, inode->i_ino);
 	exp = exp_parent(clp, nd.mnt, nd.dentry, NULL);
+	if (IS_ERR(exp)) {
+		err = PTR_ERR(exp);
+		goto out;
+	}
 	if (!exp) {
 		dprintk("nfsd: exp_rootfh export not found.\n");
 		goto out;