Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / nfs / internal.h

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 8357ff69962f22caae59d1ac357058d89800e963..b1e577302518f404e9914f1f1d9f539b1e30194c 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -123,7 +123,7 @@ struct nfs_parsed_mount_data {
                unsigned short          protocol;
        } nfs_server;
 
-       struct security_mnt_opts lsm_opts;
+       void                    *lsm_opts;
        struct net              *net;
 };
 
@@ -254,7 +254,7 @@ struct nfs_pgio_header *nfs_pgio_header_alloc(const struct nfs_rw_ops *);
 void nfs_pgio_header_free(struct nfs_pgio_header *);
 int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *);
 int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,
-                     struct rpc_cred *cred, const struct nfs_rpc_ops *rpc_ops,
+                     const struct cred *cred, const struct nfs_rpc_ops *rpc_ops,
                      const struct rpc_call_ops *call_ops, int how, int flags);
 void nfs_free_request(struct nfs_page *req);
 struct nfs_pgio_mirror *
@@ -269,7 +269,7 @@ static inline bool nfs_pgio_has_mirroring(struct nfs_pageio_descriptor *desc)
 static inline bool nfs_match_open_context(const struct nfs_open_context *ctx1,
                const struct nfs_open_context *ctx2)
 {
-       return ctx1->cred == ctx2->cred && ctx1->state == ctx2->state;
+       return cred_fscmp(ctx1->cred, ctx2->cred) == 0 && ctx1->state == ctx2->state;
 }
 
 /* nfs2xdr.c */
@@ -395,7 +395,6 @@ extern const struct super_operations nfs_sops;
 extern struct file_system_type nfs_fs_type;
 extern struct file_system_type nfs_xdev_fs_type;
 #if IS_ENABLED(CONFIG_NFS_V4)
-extern struct file_system_type nfs4_xdev_fs_type;
 extern struct file_system_type nfs4_referral_fs_type;
 #endif
 bool nfs_auth_info_match(const struct nfs_auth_info *, rpc_authflavor_t);
@@ -565,13 +564,13 @@ extern struct nfs_client *nfs4_init_client(struct nfs_client *clp,
                            const struct nfs_client_initdata *);
 extern int nfs40_walk_client_list(struct nfs_client *clp,
                                struct nfs_client **result,
-                               struct rpc_cred *cred);
+                               const struct cred *cred);
 extern int nfs41_walk_client_list(struct nfs_client *clp,
                                struct nfs_client **result,
-                               struct rpc_cred *cred);
-extern int nfs4_test_session_trunk(struct rpc_clnt *,
-                               struct rpc_xprt *,
-                               void *);
+                               const struct cred *cred);
+extern void nfs4_test_session_trunk(struct rpc_clnt *clnt,
+                               struct rpc_xprt *xprt,
+                               void *data);
 
 static inline struct inode *nfs_igrab_and_active(struct inode *inode)
 {