From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36921C433E1 for ; Fri, 22 May 2020 14:58:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF285205CB for ; Fri, 22 May 2020 14:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590159535; bh=7bdL3LfbgQTpB6p9+mW/YgtWkBdHWnz5N5/nrRUeYB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qrUFYyV3oyzV3Vn36V+MWsiSFOGtEQsly24LFcuyFaTxmevEcnbK/44AqFi04ZDlW CKGVLXbfYlGpFwhbBg2KjdI7KPAIgyFy3WOwfQaV7kaW2AMhTZjS80UOVnU2TRn+48 i4Qbbt+tLar6qIDZDDy3BXcYdWmSPOzXOUXzgLXE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730412AbgEVO6x (ORCPT ); Fri, 22 May 2020 10:58:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:51334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730585AbgEVOuS (ORCPT ); Fri, 22 May 2020 10:50:18 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A433A2145D; Fri, 22 May 2020 14:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590159018; bh=7bdL3LfbgQTpB6p9+mW/YgtWkBdHWnz5N5/nrRUeYB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MPrnOljgygAj3cz+te6txP9IMIFddc8XXe2oF59GmrlJFupJIdnkDLG+qZblr7lbM vZg7SSBARo2XwRQ1I3gt8XHfpwH+vq2Ri76pOU1rUpnVT1vMQvoIXkgEnoj0x2TZQX BeJ1qOFdUiLuQ1t8QoR9zbaeKgX2bYyGqpmUYrpw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Gruenbacher , Bob Peterson , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 5.6 16/41] gfs2: Grab glock reference sooner in gfs2_add_revoke Date: Fri, 22 May 2020 10:49:33 -0400 Message-Id: <20200522144959.434379-16-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200522144959.434379-1-sashal@kernel.org> References: <20200522144959.434379-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andreas Gruenbacher [ Upstream commit f4e2f5e1a527ce58fc9f85145b03704779a3123e ] This patch rearranges gfs2_add_revoke so that the extra glock reference is added earlier on in the function to avoid races in which the glock is freed before the new reference is taken. Signed-off-by: Andreas Gruenbacher Signed-off-by: Bob Peterson Signed-off-by: Sasha Levin --- fs/gfs2/log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 60d911e293e6..2674feda1d7a 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -603,13 +603,13 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) struct buffer_head *bh = bd->bd_bh; struct gfs2_glock *gl = bd->bd_gl; + sdp->sd_log_num_revoke++; + if (atomic_inc_return(&gl->gl_revokes) == 1) + gfs2_glock_hold(gl); bh->b_private = NULL; bd->bd_blkno = bh->b_blocknr; gfs2_remove_from_ail(bd); /* drops ref on bh */ bd->bd_bh = NULL; - sdp->sd_log_num_revoke++; - if (atomic_inc_return(&gl->gl_revokes) == 1) - gfs2_glock_hold(gl); set_bit(GLF_LFLUSH, &gl->gl_flags); list_add(&bd->bd_list, &sdp->sd_log_revokes); } -- 2.25.1