---

yaml --- r: 346513 b: refs/heads/master c: ab49bde h: refs/heads/master i: 346511: 45322fa v: v3
git-mirror · Dec 18, 2012 · a8f22e3 · a8f22e3
1 parent db612f5
commit a8f22e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);