---

yaml
---
r: 31415
b: refs/heads/master
c: 7e40536
h: refs/heads/master
i:
  31413: ac795f1
  31411: a3d05ec
  31407: 5977939
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9608b2f2f51e84eba72f4bf061d360259ce656
+refs/heads/master: 7e4053645a67097fa9bec2794d685b1d3928757a

trunk/fs/nfsd/nfsfh.c

@@ -312,8 +312,8 @@ int
 fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, struct svc_fh *ref_fh)
 {
 	/* ref_fh is a reference file handle.
-	 * if it is non-null, then we should compose a filehandle which is
-	 * of the same version, where possible.
+	 * if it is non-null and for the same filesystem, then we should compose
+	 * a filehandle which is of the same version, where possible.
 	 * Currently, that means that if ref_fh->fh_handle.fh_version == 0xca
 	 * Then create a 32byte filehandle using nfs_fhbase_old
 	 *
@@ -332,7 +332,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, st
 		parent->d_name.name, dentry->d_name.name,
 		(inode ? inode->i_ino : 0));
 
-	if (ref_fh) {
+	if (ref_fh && ref_fh->fh_export == exp) {
 		ref_fh_version = ref_fh->fh_handle.fh_version;
 		if (ref_fh_version == 0xca)
 			ref_fh_fsid_type = 0;