diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2016-01-18 18:29:15 +0100 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2016-02-22 21:02:11 +0100 |
| commit | 1a31833d085a339cf42573de0717209e8b2172e8 (patch) | |
| tree | 15c64f85564e28ef00cba6b248d321bc7fad0a99 /fs/dlm | |
| parent | Linux 4.5-rc5 (diff) | |
| download | linux-1a31833d085a339cf42573de0717209e8b2172e8.tar.xz linux-1a31833d085a339cf42573de0717209e8b2172e8.zip | |
DLM: Replace nodeid_to_addr with kernel_getpeername
This patch replaces the call to nodeid_to_addr with a call to
kernel_getpeername. This avoids taking a spinlock because it may
potentially be called from a softirq context.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/lowcomms.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 3a37bd3f9637..dc9ae6d670dc 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -469,8 +469,10 @@ static void lowcomms_error_report(struct sock *sk) { struct connection *con = sock2con(sk); struct sockaddr_storage saddr; + int buflen; - if (nodeid_to_addr(con->nodeid, &saddr, NULL, false)) { + if (con->sock == NULL || + kernel_getpeername(con->sock, (struct sockaddr *)&saddr, &buflen)) { printk_ratelimited(KERN_ERR "dlm: node %d: socket error " "sending to node %d, port %d, " "sk_err=%d/%d\n", dlm_our_nodeid(), |