Skip to content

Commit c852a6d

Browse files
Alexander Aringteigland
authored andcommitted
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 <[email protected]> Signed-off-by: David Teigland <[email protected]>
1 parent e9dd5fd commit c852a6d

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

fs/dlm/lowcomms.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -569,11 +569,8 @@ int dlm_lowcomms_nodes_set_mark(int nodeid, unsigned int mark)
569569
static void lowcomms_error_report(struct sock *sk)
570570
{
571571
struct connection *con = sock2con(sk);
572-
void (*orig_report)(struct sock *) = NULL;
573572
struct inet_sock *inet;
574573

575-
orig_report = listen_sock.sk_error_report;
576-
577574
inet = inet_sk(sk);
578575
switch (sk->sk_family) {
579576
case AF_INET:
@@ -618,8 +615,7 @@ static void lowcomms_error_report(struct sock *sk)
618615
queue_work(send_workqueue, &con->swork);
619616

620617
out:
621-
if (orig_report)
622-
orig_report(sk);
618+
listen_sock.sk_error_report(sk);
623619
}
624620

625621
static void restore_callbacks(struct socket *sock)

0 commit comments

Comments
 (0)