Merge commit 'v3.2-rc2' into fbdev-next

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 8a31a20efe7e..f85308e688fd 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -96,7 +96,6 @@ struct svc_export {
         struct auth_domain *    ex_client;
         int                     ex_flags;
         struct path             ex_path;
-        char                    *ex_pathname;
         uid_t                   ex_anon_uid;
         gid_t                   ex_anon_gid;
         int                     ex_fsid;
@@ -137,6 +136,7 @@ struct svc_export *	rqst_exp_get_by_name(struct svc_rqst *,
                                              struct path *);
 struct svc_export *     rqst_exp_parent(struct svc_rqst *,
                                         struct path *);
+struct svc_export *     rqst_find_fsidzero_export(struct svc_rqst *);
 int                     exp_rootfh(struct auth_domain *, 
                                         char *path, struct knfsd_fh *, int maxsize);
 __be32                  exp_pseudoroot(struct svc_rqst *, struct svc_fh *);