1 files changed, 6 insertions, 6 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index b0592e7c378d..0e6a179eccaf 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1330,9 +1330,9 @@ static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp, __be32 *
         *stat = exp_pseudoroot(rqstp, &tmp_fh);
         if (*stat)
                 return NULL;
-        rootpath = tmp_fh.fh_export->ex_path;
+        rootpath = tmp_fh.fh_export->ex_pathname;
 
-        path = exp->ex_path;
+        path = exp->ex_pathname;
 
         if (strncmp(path, rootpath, strlen(rootpath))) {
                 dprintk("nfsd: fs_locations failed;"
@@ -1481,7 +1481,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
                         goto out;
         }
 
-        err = vfs_getattr(exp->ex_mnt, dentry, &stat);
+        err = vfs_getattr(exp->ex_path.mnt, dentry, &stat);
         if (err)
                 goto out_nfserr;
         if ((bmval0 & (FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL |
@@ -1838,9 +1838,9 @@ out_acl:
                  * and this is the root of a cross-mounted filesystem.
                  */
                 if (ignore_crossmnt == 0 &&
-                    exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) {
-                        err = vfs_getattr(exp->ex_mnt->mnt_parent,
-                                exp->ex_mnt->mnt_mountpoint, &stat);
+                    exp->ex_path.mnt->mnt_root->d_inode == dentry->d_inode) {
+                        err = vfs_getattr(exp->ex_path.mnt->mnt_parent,
+                                exp->ex_path.mnt->mnt_mountpoint, &stat);
                         if (err)
                                 goto out_nfserr;
                 }