korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFSv4: nfs4_async_handle_error should take a non-const nfs_server

Browse Source 
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>
This commit is contained in:
Trond Myklebust 2015-09-20 16:15:24 -04:00
parent 2598ed3445
commit 516285ebe0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/nfs4proc.c
View File

@ -78,7 +78,7 @@ struct nfs4_opendata;
static int _nfs4_proc_open(struct nfs4_opendata *data); static int _nfs4_proc_open(struct nfs4_opendata *data);
static int _nfs4_recover_proc_open(struct nfs4_opendata *data); static int _nfs4_recover_proc_open(struct nfs4_opendata *data);
static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *); static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *, struct nfs4_state *, long *); static int nfs4_async_handle_error(struct rpc_task *, struct nfs_server *, struct nfs4_state *, long *);
static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr); static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr);
static int nfs4_proc_getattr(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *label); static int nfs4_proc_getattr(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *label);
static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr, struct nfs4_label *label); static 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:
static int static int
nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, nfs4_async_handle_error(struct rpc_task *task, struct nfs_server *server,
struct nfs4_state *state, long *timeout) struct nfs4_state *state, long *timeout)
{ {
struct nfs_client *clp = server->nfs_client; struct nfs_client *clp = server->nfs_client;
@ -5559,7 +5559,7 @@ struct nfs4_unlockdata {
struct nfs4_lock_state *lsp; struct nfs4_lock_state *lsp;
struct nfs_open_context *ctx; struct nfs_open_context *ctx;
struct file_lock fl; struct file_lock fl;
const struct nfs_server *server; struct nfs_server *server;
unsigned long timestamp; unsigned long timestamp;
}; };

6
include/linux/nfs_xdr.h
View File

@ -528,7 +528,7 @@ struct nfs4_delegreturnargs {
struct nfs4_delegreturnres { struct nfs4_delegreturnres {
struct nfs4_sequence_res seq_res; struct nfs4_sequence_res seq_res;
struct nfs_fattr * fattr; struct nfs_fattr * fattr;
const struct nfs_server *server; struct nfs_server *server;
}; };
/* /*
@ -601,7 +601,7 @@ struct nfs_removeargs {
struct nfs_removeres { struct nfs_removeres {
struct nfs4_sequence_res seq_res; struct nfs4_sequence_res seq_res;
const struct nfs_server *server; struct nfs_server *server;
struct nfs_fattr *dir_attr; struct nfs_fattr *dir_attr;
struct nfs4_change_info cinfo; struct nfs4_change_info cinfo;
}; };
@ -619,7 +619,7 @@ struct nfs_renameargs {
struct nfs_renameres { struct nfs_renameres {
struct nfs4_sequence_res seq_res; struct nfs4_sequence_res seq_res;
const struct nfs_server *server; struct nfs_server *server;
struct nfs4_change_info old_cinfo; struct nfs4_change_info old_cinfo;
struct nfs_fattr *old_fattr; struct nfs_fattr *old_fattr;
struct nfs4_change_info new_cinfo; struct nfs4_change_info new_cinfo;