From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D9C9222D65; Thu, 12 Dec 2024 16:39:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021576; cv=none; b=r2l9OdARZBdFv4q0XFYgo56OLKkskdMgl3jGQltGiqSOo+H/iV42galSac9viFVkinadfuJbPaS0I7YyscOp63Oph+P3FcvXCB7NCLuxBCmduSlvD39yUS+VSdRGm/m3Ca5cBp7jdW1jAkkM2w1ozNmGqopsfAr1hoCd/Qhfu8I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021576; c=relaxed/simple; bh=qMn01LIPp3g/W3FVQ7zbOxMCX+hEl6wJwdp9pHVfaWw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gbqdtFjJbxPdUvMniCe618t/+Pa69cM9lWsz18UHY+S9nnbTiebQPAnFgAgdBO56bVL+KWODO7wnopKjJVcq7O9LzbHcFZdyd5UaJy2cszfMTQKVdBIIs81vK38P/IzQ5I3Z+lj0KhjmcyIUGj28qJ+PjITDFc+2KAcBoV6+Vzg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sqGueLt6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sqGueLt6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FB53C4CECE; Thu, 12 Dec 2024 16:39:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734021576; bh=qMn01LIPp3g/W3FVQ7zbOxMCX+hEl6wJwdp9pHVfaWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sqGueLt6OscOa0Wn7TZjk0dHRy9Rx//Q9WZGDPA7ptAbTK+BwUfnMJAWDiHhXdz1J ZKVqKfQ8AH14QMvz2r6b0AR0Oml+jqxHGWJiNb9DNNLabdEk6jeVTC3mqhjbKK41QP B30tkAdNsv8ttruFDjzTJOi5roL1tdO3wd2K2F0M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Heming Zhao Subject: [PATCH 6.1 750/772] ocfs2: Revert "ocfs2: fix the la space leak when unmounting an ocfs2 volume" Date: Thu, 12 Dec 2024 16:01:35 +0100 Message-ID: <20241212144420.920716934@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heming Zhao This reverts commit dfe6c5692fb5 ("ocfs2: fix the la space leak when unmounting an ocfs2 volume"). In commit dfe6c5692fb5, the commit log "This bug has existed since the initial OCFS2 code." is wrong. The correct introduction commit is 30dd3478c3cd ("ocfs2: correctly use ocfs2_find_next_zero_bit()"). The influence of commit dfe6c5692fb5 is that it provides a correct fix for the latest kernel. however, it shouldn't be pushed to stable branches. Let's use this commit to revert all branches that include dfe6c5692fb5 and use a new fix method to fix commit 30dd3478c3cd. Fixes: dfe6c5692fb5 ("ocfs2: fix the la space leak when unmounting an ocfs2 volume") Signed-off-by: Heming Zhao Cc: Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/localalloc.c | 19 ------------------- 1 file changed, 19 deletions(-) --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c @@ -1008,25 +1008,6 @@ static int ocfs2_sync_local_to_main(stru start = bit_off + 1; } - /* clear the contiguous bits until the end boundary */ - if (count) { - blkno = la_start_blk + - ocfs2_clusters_to_blocks(osb->sb, - start - count); - - trace_ocfs2_sync_local_to_main_free( - count, start - count, - (unsigned long long)la_start_blk, - (unsigned long long)blkno); - - status = ocfs2_release_clusters(handle, - main_bm_inode, - main_bm_bh, blkno, - count); - if (status < 0) - mlog_errno(status); - } - bail: if (status) mlog_errno(status);