diff options
author | Andy Adamson <andros@netapp.com> | 2016-02-05 16:08:37 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-02-05 20:13:53 -0500 |
commit | 02a95dee8cf03a73982f9cabf549c04ae354bed7 (patch) | |
tree | becd849192f7b026367fac68f9cca21e42a28fff | |
parent | fc821d59209d96e80f30f670a3acac9582dfdefd (diff) |
NFS add callback_ops to nfs4_proc_bind_conn_to_session_callback
Fix oops when NULL callback_ops pointer accessed in rpc_init_task
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/nfs4proc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 36471e013a73..dbc3dc2f65cd 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -6782,6 +6782,15 @@ nfs41_same_server_scope(struct nfs41_server_scope *a, | |||
6782 | return false; | 6782 | return false; |
6783 | } | 6783 | } |
6784 | 6784 | ||
6785 | static void | ||
6786 | nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata) | ||
6787 | { | ||
6788 | } | ||
6789 | |||
6790 | static const struct rpc_call_ops nfs4_bind_one_conn_to_session_ops = { | ||
6791 | .rpc_call_done = &nfs4_bind_one_conn_to_session_done, | ||
6792 | }; | ||
6793 | |||
6785 | /* | 6794 | /* |
6786 | * nfs4_proc_bind_one_conn_to_session() | 6795 | * nfs4_proc_bind_one_conn_to_session() |
6787 | * | 6796 | * |
@@ -6810,6 +6819,7 @@ int nfs4_proc_bind_one_conn_to_session(struct rpc_clnt *clnt, | |||
6810 | struct rpc_task_setup task_setup_data = { | 6819 | struct rpc_task_setup task_setup_data = { |
6811 | .rpc_client = clnt, | 6820 | .rpc_client = clnt, |
6812 | .rpc_xprt = xprt, | 6821 | .rpc_xprt = xprt, |
6822 | .callback_ops = &nfs4_bind_one_conn_to_session_ops, | ||
6813 | .rpc_message = &msg, | 6823 | .rpc_message = &msg, |
6814 | .flags = RPC_TASK_TIMEOUT, | 6824 | .flags = RPC_TASK_TIMEOUT, |
6815 | }; | 6825 | }; |