|
@@ -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;
|
|
};
|
|
};
|
|
|
|
|