From 01fd5f4fc6c0048bf96cf9aca7e0510deb5992b3 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 30 Jun 2006 01:56:12 -0700 Subject: [PATCH] --- yaml --- r: 31415 b: refs/heads/master c: 7e4053645a67097fa9bec2794d685b1d3928757a h: refs/heads/master i: 31413: ac795f14309fbc10b9d5fcc05d622b40decb6df7 31411: a3d05ecbd6d59ec88c6ed2dbad51411bb131e7fd 31407: 5977939a28ef3e47ef87c9798e8f232888f7e38b v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfsfh.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 54a02b6ac557..347b6f6e9ffd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c9608b2f2f51e84eba72f4bf061d360259ce656 +refs/heads/master: 7e4053645a67097fa9bec2794d685b1d3928757a diff --git a/trunk/fs/nfsd/nfsfh.c b/trunk/fs/nfsd/nfsfh.c index e3f3bbea8ae7..ca96ede30a10 100644 --- a/trunk/fs/nfsd/nfsfh.c +++ b/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;