fs: dlm: use saved sk_error_report()

This patch changes the handling of calling the original
sk_error_report() by not putting it on the stack and calling it later.
If the listen_sock.sk_error_report() is NULL in this moment it indicates
a bug in our implementation.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 677e31144ca0b5b1216dd3235fb549bf40457e75..643f9810ec3581c38f2f57b55ff0df9dfa9a9b3c 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -569,11 +569,8 @@ int dlm_lowcomms_nodes_set_mark(int nodeid, unsigned int mark)
 static void lowcomms_error_report(struct sock *sk)
 {
        struct connection *con = sock2con(sk);
-       void (*orig_report)(struct sock *) = NULL;
        struct inet_sock *inet;
 
-       orig_report = listen_sock.sk_error_report;
-
        inet = inet_sk(sk);
        switch (sk->sk_family) {
        case AF_INET:
@@ -618,8 +615,7 @@ static void lowcomms_error_report(struct sock *sk)
                queue_work(send_workqueue, &con->swork);
 
 out:
-       if (orig_report)
-               orig_report(sk);
+       listen_sock.sk_error_report(sk);
 }
 
 static void restore_callbacks(struct socket *sock)