6.1-stable patches

added patches:
	ocfs2-revert-ocfs2-fix-the-la-space-leak-when-unmounting-an-ocfs2-volume.patch

diff --git a/queue-6.1/ocfs2-revert-ocfs2-fix-the-la-space-leak-when-unmounting-an-ocfs2-volume.patch b/queue-6.1/ocfs2-revert-ocfs2-fix-the-la-space-leak-when-unmounting-an-ocfs2-volume.patch
new file mode 100644 (file)
index 0000000..fa5e6aa
--- /dev/null
+++ b/queue-6.1/ocfs2-revert-ocfs2-fix-the-la-space-leak-when-unmounting-an-ocfs2-volume.patch
@@ -0,0 +1,58 @@
+From heming.zhao@suse.com  Thu Dec 12 12:39:14 2024
+From: Heming Zhao <heming.zhao@suse.com>
+Date: Thu, 12 Dec 2024 19:31:05 +0800
+Subject: ocfs2: Revert "ocfs2: fix the la space leak when unmounting an ocfs2 volume"
+To: joseph.qi@linux.alibaba.com, gregkh@linuxfoundation.org
+Cc: Heming Zhao <heming.zhao@suse.com>, linux-kernel@vger.kernel.org, stable@vger.kernel.org, ocfs2-devel@lists.linux.dev
+Message-ID: <20241212113107.9792-1-heming.zhao@suse.com>
+
+From: Heming Zhao <heming.zhao@suse.com>
+
+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 <heming.zhao@suse.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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);

diff --git a/queue-6.1/series b/queue-6.1/series
index 587f91e1240ec6f41d6c0cc78d19938546cf7af3..5e37dda7d72d739bd165f065159ef2bb5a34fc47 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -751,3 +751,4 @@ io_uring-wake-up-optimisations.patch
 xhci-dbc-fix-stall-transfer-event-handling.patch
 mmc-mtk-sd-fix-error-handle-of-probe-function.patch
 drm-amd-display-check-bios-images-before-it-is-used.patch
+ocfs2-revert-ocfs2-fix-the-la-space-leak-when-unmounting-an-ocfs2-volume.patch