From a8f22e342dcac6d07fb98576053c9ed01314fa5a Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Mon, 17 Dec 2012 16:05:06 -0800
Subject: [PATCH] --- yaml --- r: 346513 b: refs/heads/master c:
 ab49bdecc3ebb46ab661f5f05d5c5ea9606406c6 h: refs/heads/master i:   346511:
 45322fa24eb3bdd903d012785cfadfb6dcbeb54c v: v3

---
 [refs]                    | 2 +-
 trunk/fs/exportfs/expfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2bc29882acc3..ac6901096d43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 138d22b58696c506799f8de759804083ff9effae
+refs/heads/master: ab49bdecc3ebb46ab661f5f05d5c5ea9606406c6
diff --git a/trunk/fs/exportfs/expfs.c b/trunk/fs/exportfs/expfs.c
index 29ab099e3e08..10f137381ac7 100644
--- a/trunk/fs/exportfs/expfs.c
+++ b/trunk/fs/exportfs/expfs.c
@@ -357,7 +357,7 @@ int exportfs_encode_fh(struct dentry *dentry, struct fid *fid, int *max_len,
 		 */
 		parent = p->d_inode;
 	}
-	if (nop->encode_fh)
+	if (nop && nop->encode_fh)
 		error = nop->encode_fh(inode, fid->raw, max_len, parent);
 	else
 		error = export_encode_fh(inode, fid, max_len, parent);