Commit a56baa22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fix from David Sterba:
 "A fixup to the xarray conversion sent in the main 6.16 batch. It was
  not included because it would cause rebase/refresh of like 80 patches,
  right before sending the early pull request last week.

  It's fixing a bug when zoned mode is enabled on btrfs so it's not
  affecting most people"

* tag 'for-6.16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: don't drop a reference if btrfs_check_write_meta_pointer() fails
parents b08494a8 b83825a8

fs/btrfs/extent_io.c

+0 −1
Original line number Diff line number Diff line
@@ -2189,7 +2189,6 @@ int btree_write_cache_pages(struct address_space *mapping, 
					done = 1;

					break;

				}

				free_extent_buffer(eb);

				continue;

			}