Skip to content

Commit 3e26e24

Browse files
zhaohemgregkh
authored andcommitted
ocfs2: Revert "ocfs2: fix the la space leak when unmounting an ocfs2 volume"
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. Fixes: dfe6c56 ("ocfs2: fix the la space leak when unmounting an ocfs2 volume") Signed-off-by: Heming Zhao <[email protected]> Cc: <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7a670b4 commit 3e26e24

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

fs/ocfs2/localalloc.c

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

1011-
/* clear the contiguous bits until the end boundary */
1012-
if (count) {
1013-
blkno = la_start_blk +
1014-
ocfs2_clusters_to_blocks(osb->sb,
1015-
start - count);
1016-
1017-
trace_ocfs2_sync_local_to_main_free(
1018-
count, start - count,
1019-
(unsigned long long)la_start_blk,
1020-
(unsigned long long)blkno);
1021-
1022-
status = ocfs2_release_clusters(handle,
1023-
main_bm_inode,
1024-
main_bm_bh, blkno,
1025-
count);
1026-
if (status < 0)
1027-
mlog_errno(status);
1028-
}
1029-
10301011
bail:
10311012
if (status)
10321013
mlog_errno(status);

0 commit comments

Comments
 (0)