lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 139/201] dlm: fix pending remove if msg allocation fails
    Date
    From: Alexander Aring <aahringo@redhat.com>

    [ Upstream commit ba58995909b5098ca4003af65b0ccd5a8d13dd25 ]

    This patch unsets ls_remove_len and ls_remove_name if a message
    allocation of a remove messages fails. In this case we never send a
    remove message out but set the per ls ls_remove_len ls_remove_name
    variable for a pending remove. Unset those variable should indicate
    possible waiters in wait_pending_remove() that no pending remove is
    going on at this moment.

    Cc: stable@vger.kernel.org
    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/lock.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
    index bb9e85e8819c..9f93496d2cc9 100644
    --- a/fs/dlm/lock.c
    +++ b/fs/dlm/lock.c
    @@ -4065,13 +4065,14 @@ static void send_repeat_remove(struct dlm_ls *ls, char *ms_name, int len)
    rv = _create_message(ls, sizeof(struct dlm_message) + len,
    dir_nodeid, DLM_MSG_REMOVE, &ms, &mh);
    if (rv)
    - return;
    + goto out;

    memcpy(ms->m_extra, name, len);
    ms->m_hash = hash;

    send_message(mh, ms);

    +out:
    spin_lock(&ls->ls_remove_spin);
    ls->ls_remove_len = 0;
    memset(ls->ls_remove_name, 0, DLM_RESNAME_MAXLEN);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-07-27 19:21    [W:4.204 / U:1.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site