btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()

Commit Message

Dominique Martinet April 19, 2024, 2:22 a.m. UTC

From: Dominique Martinet <[e-mail]>

The previous patch forgot to unlock in the error path

Link: https://lore.kernel.org/all/[e-mail]
Reported-by: Pavel Machek <[e-mail]>
Cc: [e-mail]
Fixes: 7411055db5ce ("btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()")
Signed-off-by: Dominique Martinet <[e-mail]>
---
Note for stable: the mutex has been renamed from delete_unused_bgs_mutex
in 5.13, so the 5.10 and 4.19 backports need a trivial rename:
  s/reclaim_bgs_lock/delete_unused_bgs_mutex/
If required I'll send branch-specific patches after this is merged.
---
 fs/btrfs/volumes.c | 1 +
 1 file changed, 1 insertion(+)


---
base-commit: 2668e3ae2ef36d5e7c52f818ad7d90822c037de4
change-id: 20240419-btrfs_unlock-95e0b3e2e2fc

Best regards,

Comments

Pavel Machek April 19, 2024, 9:17 a.m. UTC | #1

On Fri 2024-04-19 11:22:48, Dominique Martinet wrote:
> From: Dominique Martinet <[e-mail]>
> 
> The previous patch forgot to unlock in the error path
> 
> Link: https://lore.kernel.org/all/[e-mail]
> Reported-by: Pavel Machek <[e-mail]>
> Cc: [e-mail]
> Fixes: 7411055db5ce ("btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()")
> Signed-off-by: Dominique Martinet<[e-mail]>

Reviewed-by: Pavel Machek <[e-mail]>

Thank you!

Best regards,
								Pavel

David Sterba April 23, 2024, 2:38 p.m. UTC | #2

On Fri, Apr 19, 2024 at 11:22:48AM +0900, Dominique Martinet wrote:
> From: Dominique Martinet <[e-mail]>
> 
> The previous patch forgot to unlock in the error path
> 
> Link: https://lore.kernel.org/all/[e-mail]
> Reported-by: Pavel Machek <[e-mail]>
> Cc: [e-mail]
> Fixes: 7411055db5ce ("btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()")
> Signed-off-by: Dominique Martinet <[e-mail]>

Added to for-next, thanks for catching it.

Patch

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f15591f3e54f..ef6bd2f4251b 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3455,6 +3455,7 @@  static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info)
 			 * alignment and size).
 			 */
 			ret = -EUCLEAN;
+			mutex_unlock(&fs_info->reclaim_bgs_lock);
 			goto error;
 		}