Commit 69b41ac8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:
 "First batch of regression and regular fixes:

   - regressions:
       - fix error handling after conversion to qstr for paths
       - fix raid56/scrub recovery caused by uninitialized variable
         after conversion to error bitmaps
       - restore qgroup backref lookup behaviour after recent
         refactoring
       - fix leak of device lists at module exit time

   - fix resolving backrefs for inline extent followed by prealloc

   - reset defrag ioctl buffer on memory allocation error"

* tag 'for-6.2-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix fscrypt name leak after failure to join log transaction
  btrfs: scrub: fix uninitialized return value in recover_scrub_rbio
  btrfs: fix resolving backrefs for inline extent followed by prealloc
  btrfs: fix trace event name typo for FLUSH_DELAYED_REFS
  btrfs: restore BTRFS_SEQ_LAST when looking up qgroup backref lookup
  btrfs: fix leak of fs devices after removing btrfs module
  btrfs: fix an error handling path in btrfs_defrag_leaves()
  btrfs: fix an error handling path in btrfs_rename()
parents 0226635c fee4c199

fs/btrfs/backref.c

+4 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ static int add_all_parents(struct btrfs_backref_walk_ctx *ctx, 
	u64 wanted_disk_byte = ref->wanted_disk_byte;

	u64 count = 0;

	u64 data_offset;

	u8 type;



	if (level != 0) {

		eb = path->nodes[level];
@@ -538,6 +539,9 @@ static int add_all_parents(struct btrfs_backref_walk_ctx *ctx, 
			continue;

		}

		fi = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item);

		type = btrfs_file_extent_type(eb, fi);

		if (type == BTRFS_FILE_EXTENT_INLINE)

			goto next;

		disk_byte = btrfs_file_extent_disk_bytenr(eb, fi);

		data_offset = btrfs_file_extent_offset(eb, fi);

fs/btrfs/defrag.c

+4 −2
Original line number Diff line number Diff line
@@ -358,8 +358,10 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, 
		goto out;



	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;

	if (!path) {

		ret = -ENOMEM;

		goto out;

	}



	level = btrfs_header_level(root->node);

fs/btrfs/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -9377,8 +9377,10 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 


	if (flags & RENAME_WHITEOUT) {

		whiteout_args.inode = new_whiteout_inode(mnt_userns, old_dir);

		if (!whiteout_args.inode)

			return -ENOMEM;

		if (!whiteout_args.inode) {

			ret = -ENOMEM;

			goto out_fscrypt_names;

		}

		ret = btrfs_new_inode_prepare(&whiteout_args, &trans_num_items);

		if (ret)

			goto out_whiteout_inode;

fs/btrfs/qgroup.c

+1 −0
Original line number Diff line number Diff line
@@ -2787,6 +2787,7 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) 
			 * current root. It's safe inside commit_transaction().

			 */

			ctx.trans = trans;

			ctx.time_seq = BTRFS_SEQ_LAST;

			ret = btrfs_find_all_roots(&ctx, false);

			if (ret < 0)

				goto cleanup;

fs/btrfs/raid56.c

+1 −1
Original line number Diff line number Diff line
@@ -2646,7 +2646,7 @@ static int recover_scrub_rbio(struct btrfs_raid_bio *rbio) 
	void **pointers = NULL;

	void **unmap_array = NULL;

	int sector_nr;

	int ret;

	int ret = 0;



	/*

	 * @pointers array stores the pointer for each sector.