lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 082/563] fs: dlm: use sk->sk_socket instead of con->sock
    Date
    From: Alexander Aring <aahringo@redhat.com>

    [ Upstream commit feb704bd17786c8ff52a49d7759b8ee4f3a5aaac ]

    Instead of dereference "con->sock" we can get the socket structure over
    "sk->sk_socket" as well. This patch will switch to this behaviour.

    Signed-off-by: Alexander Aring <aahringo@redhat.com>
    Signed-off-by: David Teigland <teigland@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/dlm/lowcomms.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
    index 0c78fdfb1f6fa..0a8645ed4b2d6 100644
    --- a/fs/dlm/lowcomms.c
    +++ b/fs/dlm/lowcomms.c
    @@ -480,8 +480,7 @@ static void lowcomms_error_report(struct sock *sk)
    goto out;

    orig_report = listen_sock.sk_error_report;
    - if (con->sock == NULL ||
    - kernel_getpeername(con->sock, (struct sockaddr *)&saddr) < 0) {
    + if (kernel_getpeername(sk->sk_socket, (struct sockaddr *)&saddr) < 0) {
    printk_ratelimited(KERN_ERR "dlm: node %d: socket error "
    "sending to node %d, port %d, "
    "sk_err=%d/%d\n", dlm_our_nodeid(),
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:11    [W:4.023 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site