Skip to content

Commit 1a72d2e

Browse files
zhaohemakpm00
authored andcommitted
ocfs2: revert "ocfs2: fix the la space leak when unmounting an ocfs2 volume"
Patch series "Revert ocfs2 commit dfe6c56 and provide a new fix". SUSE QA team detected a mistake in my commit dfe6c56 ("ocfs2: fix the la space leak when unmounting an ocfs2 volume"). I am very sorry for my error. (If my eyes are correct) From the mailling list mails, this patch shouldn't be applied to 4.19 5.4 5.10 5.15 6.1 6.6, and these branches should perform a revert operation. Reason for revert: In commit dfe6c56, I mistakenly wrote: "This bug has existed since the initial OCFS2 code.". The statement is wrong. The correct introduction commit is 30dd347. IOW, if the branch doesn't include 30dd347, dfe6c56 should also not be included. This reverts commit dfe6c56 ("ocfs2: fix the la space leak when unmounting an ocfs2 volume"). In commit dfe6c56, the commit log "This bug has existed since the initial OCFS2 code." is wrong. The correct introduction commit is 30dd347 ("ocfs2: correctly use ocfs2_find_next_zero_bit()"). The influence of commit dfe6c56 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 dfe6c56 and use a new fix method to fix commit 30dd347. Link: https://lkml.kernel.org/r/20241205104835.18223-1-heming.zhao@suse.com Link: https://lkml.kernel.org/r/20241205104835.18223-2-heming.zhao@suse.com Fixes: dfe6c56 ("ocfs2: fix the la space leak when unmounting an ocfs2 volume") Signed-off-by: Heming Zhao <heming.zhao@suse.com> Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: Changwei Ge <gechangwei@live.cn> Cc: Jun Piao <piaojun@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent da5bd7f commit 1a72d2e

1 file changed

Lines changed: 0 additions & 19 deletions

File tree

fs/ocfs2/localalloc.c

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,25 +1002,6 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
10021002
start = bit_off + 1;
10031003
}
10041004

1005-
/* clear the contiguous bits until the end boundary */
1006-
if (count) {
1007-
blkno = la_start_blk +
1008-
ocfs2_clusters_to_blocks(osb->sb,
1009-
start - count);
1010-
1011-
trace_ocfs2_sync_local_to_main_free(
1012-
count, start - count,
1013-
(unsigned long long)la_start_blk,
1014-
(unsigned long long)blkno);
1015-
1016-
status = ocfs2_release_clusters(handle,
1017-
main_bm_inode,
1018-
main_bm_bh, blkno,
1019-
count);
1020-
if (status < 0)
1021-
mlog_errno(status);
1022-
}
1023-
10241005
bail:
10251006
if (status)
10261007
mlog_errno(status);

0 commit comments

Comments
 (0)