Commit 516285eb authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 2598ed34

fs/nfs/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct nfs4_opendata; 
static int _nfs4_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_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 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);
@@ -4982,7 +4982,7 @@ nfs4_set_security_label(struct dentry *dentry, const void *buf, size_t buflen) 




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 nfs_client *clp = server->nfs_client;
@@ -5559,7 +5559,7 @@ struct nfs4_unlockdata { 
	struct nfs4_lock_state *lsp;

	struct nfs_open_context *ctx;

	struct file_lock fl;

	const struct nfs_server *server;

	struct nfs_server *server;

	unsigned long timestamp;

};

include/linux/nfs_xdr.h

+3 −3
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ struct nfs4_delegreturnargs { 
struct nfs4_delegreturnres {

	struct nfs4_sequence_res	seq_res;

	struct nfs_fattr * fattr;

	const struct nfs_server *server;

	struct nfs_server *server;

};



/*
@@ -601,7 +601,7 @@ struct nfs_removeargs { 


struct nfs_removeres {

	struct nfs4_sequence_res 	seq_res;

	const struct nfs_server *server;

	struct nfs_server *server;

	struct nfs_fattr	*dir_attr;

	struct nfs4_change_info	cinfo;

};
@@ -619,7 +619,7 @@ struct nfs_renameargs { 


struct nfs_renameres {

	struct nfs4_sequence_res	seq_res;

	const struct nfs_server		*server;

	struct nfs_server		*server;

	struct nfs4_change_info		old_cinfo;

	struct nfs_fattr		*old_fattr;

	struct nfs4_change_info		new_cinfo;