X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fnfs%2Fnfs4_fs.h;h=d2802b1ca3b9b84d57efbadd789c019094e2bc2e;hb=af22f94ae02ab9dd4fd7fe628c8434a59cc293be;hp=dd1aa2b598cee26bfbcdc9d75536d021a1b8cd49;hpb=8bda4e4c98d14566fc1a354c62fb59d70cc49b97;p=linux-2.6-block.git

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index dd1aa2b598ce..d2802b1ca3b9 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -83,6 +83,7 @@ struct nfs_unique_id {
 struct nfs4_state_owner {
 	struct nfs_unique_id so_owner_id;
 	struct nfs_client    *so_client;
+	struct nfs_server    *so_server;
 	struct rb_node	     so_client_node;
 
 	struct rpc_cred	     *so_cred;	 /* Associated cred */
@@ -181,7 +182,7 @@ extern int nfs4_do_close(struct path *path, struct nfs4_state *state);
 extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);
 extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *);
 extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle);
-extern int nfs4_proc_fs_locations(struct inode *dir, struct qstr *name,
+extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
 		struct nfs4_fs_locations *fs_locations, struct page *page);
 
 extern struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops;