Commit 23c2c8c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more btrfs updates from David Sterba:
 "One minor update, the rest are fixes that have arrived a bit late for
  the first batch. There are also some recent fixes for bugs that were
  discovered during the merge window and pop up during testing.

  User visible change:

   - show correct subvolume path in /proc/mounts for bind mounts

  Fixes:

   - fix compression messages when remounting with different level or
     compression algorithm

   - tree-log: fix some memory leaks on error handling paths

   - restore I_VERSION on remount

   - fix return values and error code mixups

   - fix umount crash with quotas enabled when removing sysfs files

   - fix trim range on a shrunk device"

* tag 'for-5.9-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: trim: fix underflow in trim length to prevent access beyond device boundary
  btrfs: fix return value mixup in btrfs_get_extent
  btrfs: sysfs: fix NULL pointer dereference at btrfs_sysfs_del_qgroups()
  btrfs: check correct variable after allocation in btrfs_backref_iter_alloc
  btrfs: make sure SB_I_VERSION doesn't get unset by remount
  btrfs: fix memory leaks after failure to lookup checksums during inode logging
  btrfs: don't show full path of bind mounts in subvol=
  btrfs: fix messages after changing compression level by remount
  btrfs: only search for left_info if there is no right_info in try_merge_free_space
  btrfs: inode: fix NULL pointer dereference if inode doesn't need compression
parents 69307ade c57dd1f2

fs/btrfs/backref.c

+1 −1
Original line number Diff line number Diff line
@@ -2303,7 +2303,7 @@ struct btrfs_backref_iter *btrfs_backref_iter_alloc( 
		return NULL;



	ret->path = btrfs_alloc_path();

	if (!ret) {

	if (!ret->path) {

		kfree(ret);

		return NULL;

	}

fs/btrfs/extent-io-tree.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ struct io_failure_record; 
 */

#define CHUNK_ALLOCATED				EXTENT_DIRTY

#define CHUNK_TRIMMED				EXTENT_DEFRAG

#define CHUNK_STATE_MASK			(CHUNK_ALLOCATED |		\

						 CHUNK_TRIMMED)



enum {

	IO_TREE_FS_PINNED_EXTENTS,

fs/btrfs/extent-tree.c

+14 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "delalloc-space.h"

#include "block-group.h"

#include "discard.h"

#include "rcu-string.h"



#undef SCRAMBLE_DELAYED_REFS
@@ -5668,6 +5669,19 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed) 
					    &start, &end,

					    CHUNK_TRIMMED | CHUNK_ALLOCATED);



		/* Check if there are any CHUNK_* bits left */

		if (start > device->total_bytes) {

			WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));

			btrfs_warn_in_rcu(fs_info,

"ignoring attempt to trim beyond device size: offset %llu length %llu device %s device size %llu",

					  start, end - start + 1,

					  rcu_str_deref(device->name),

					  device->total_bytes);

			mutex_unlock(&fs_info->chunk_mutex);

			ret = 0;

			break;

		}



		/* Ensure we skip the reserved area in the first 1M */

		start = max_t(u64, start, SZ_1M);

fs/btrfs/free-space-cache.c

+2 −2
Original line number Diff line number Diff line
@@ -2282,7 +2282,7 @@ out: 
static bool try_merge_free_space(struct btrfs_free_space_ctl *ctl,

			  struct btrfs_free_space *info, bool update_stat)

{

	struct btrfs_free_space *left_info;

	struct btrfs_free_space *left_info = NULL;

	struct btrfs_free_space *right_info;

	bool merged = false;

	u64 offset = info->offset;
@@ -2298,7 +2298,7 @@ static bool try_merge_free_space(struct btrfs_free_space_ctl *ctl, 
	if (right_info && rb_prev(&right_info->offset_index))

		left_info = rb_entry(rb_prev(&right_info->offset_index),

				     struct btrfs_free_space, offset_index);

	else

	else if (!right_info)

		left_info = tree_search_offset(ctl, offset - 1, 0, 0);



	/* See try_merge_free_space() comment. */

fs/btrfs/inode.c

+12 −6
Original line number Diff line number Diff line
@@ -654,12 +654,18 @@ cont: 
						     page_error_op |

						     PAGE_END_WRITEBACK);



			/*

			 * Ensure we only free the compressed pages if we have

			 * them allocated, as we can still reach here with

			 * inode_need_compress() == false.

			 */

			if (pages) {

				for (i = 0; i < nr_pages; i++) {

					WARN_ON(pages[i]->mapping);

					put_page(pages[i]);

				}

				kfree(pages);



			}

			return 0;

		}

	}
@@ -6622,7 +6628,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, 
	    extent_type == BTRFS_FILE_EXTENT_PREALLOC) {

		/* Only regular file could have regular/prealloc extent */

		if (!S_ISREG(inode->vfs_inode.i_mode)) {

			ret = -EUCLEAN;

			err = -EUCLEAN;

			btrfs_crit(fs_info,

		"regular/prealloc extent found for non-regular inode %llu",

				   btrfs_ino(inode));

CRA Git | Maintained and supported by SUSTech CRA and CCSE