aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-09-20 16:15:24 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-10-08 10:45:52 -0400
commit516285ebe0efadc40b914a0e61a913a390604810 (patch)
tree4d98f05bba8768fc589c6fa84fcb50224ce33b53 /fs/nfs/nfs4proc.c
parent2598ed344586cf3612bfbd33041527c55543acfe (diff)
NFSv4: nfs4_async_handle_error should take a non-const nfs_server
For symmetry with the synchronous handler, and so that we can potentially handle errors such as NFS4ERR_BADNAME. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d044c7b11ff7..ae5cde621954 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -78,7 +78,7 @@ struct nfs4_opendata;
78static int _nfs4_proc_open(struct nfs4_opendata *data); 78static int _nfs4_proc_open(struct nfs4_opendata *data);
79static int _nfs4_recover_proc_open(struct nfs4_opendata *data); 79static int _nfs4_recover_proc_open(struct nfs4_opendata *data);
80static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *); 80static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
81static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *, struct nfs4_state *, long *); 81static int nfs4_async_handle_error(struct rpc_task *, struct nfs_server *, struct nfs4_state *, long *);
82static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr); 82static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr);
83static int nfs4_proc_getattr(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *label); 83static int nfs4_proc_getattr(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *label);
84static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr, struct nfs4_label *label); 84static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr, struct nfs4_label *label);
@@ -4982,7 +4982,7 @@ out:
4982 4982
4983 4983
4984static int 4984static int
4985nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 4985nfs4_async_handle_error(struct rpc_task *task, struct nfs_server *server,
4986 struct nfs4_state *state, long *timeout) 4986 struct nfs4_state *state, long *timeout)
4987{ 4987{
4988 struct nfs_client *clp = server->nfs_client; 4988 struct nfs_client *clp = server->nfs_client;
@@ -5559,7 +5559,7 @@ struct nfs4_unlockdata {
5559 struct nfs4_lock_state *lsp; 5559 struct nfs4_lock_state *lsp;
5560 struct nfs_open_context *ctx; 5560 struct nfs_open_context *ctx;
5561 struct file_lock fl; 5561 struct file_lock fl;
5562 const struct nfs_server *server; 5562 struct nfs_server *server;
5563 unsigned long timestamp; 5563 unsigned long timestamp;
5564}; 5564};
5565 5565