Commit 18d46e76 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:
 "A few fixes and message updates:

   - for simple quotas, handle the case when a snapshot is created and
     the target qgroup already exists

   - fix a warning when file descriptor given to send ioctl is not
     writable

   - fix off-by-one condition when checking chunk maps

   - free pages when page array allocation fails during compression
     read, other cases were handled

   - fix memory leak on error handling path in ref-verify debugging
     feature

   - copy missing struct member 'version' in 64/32bit compat send ioctl

   - tree-checker verifies inline backref ordering

   - print messages to syslog on first mount and last unmount

   - update error messages when reading chunk maps"

* tag 'for-6.7-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: send: ensure send_fd is writable
  btrfs: free the allocated memory if btrfs_alloc_page_array() fails
  btrfs: fix 64bit compat send ioctl arguments not initializing version member
  btrfs: make error messages more clear when getting a chunk map
  btrfs: fix off-by-one when checking chunk map includes logical address
  btrfs: ref-verify: fix memory leaks in btrfs_ref_tree_mod()
  btrfs: add dmesg output for first mount and last unmount of a filesystem
  btrfs: do not abort transaction if there is already an existing qgroup
  btrfs: tree-checker: add type and sequence check for inline backrefs
parents df60cee2 0ac1d13a

fs/btrfs/disk-io.c

+1 −0
Original line number Diff line number Diff line
@@ -3213,6 +3213,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
		goto fail_alloc;

	}



	btrfs_info(fs_info, "first mount of filesystem %pU", disk_super->fsid);

	/*

	 * Verify the type first, if that or the checksum value are

	 * corrupted, we'll find out

fs/btrfs/extent_io.c

+8 −3
Original line number Diff line number Diff line
@@ -674,8 +674,8 @@ static void end_bio_extent_readpage(struct btrfs_bio *bbio) 
 * 		the array will be skipped

 *

 * Return: 0        if all pages were able to be allocated;

 *         -ENOMEM  otherwise, and the caller is responsible for freeing all

 *                  non-null page pointers in the array.

 *         -ENOMEM  otherwise, the partially allocated pages would be freed and

 *                  the array slots zeroed

 */

int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array)

{
@@ -694,8 +694,13 @@ int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array) 
		 * though alloc_pages_bulk_array() falls back to alloc_page()

		 * if  it could not bulk-allocate. So we must be out of memory.

		 */

		if (allocated == last)

		if (allocated == last) {

			for (int i = 0; i < allocated; i++) {

				__free_page(page_array[i]);

				page_array[i] = NULL;

			}

			return -ENOMEM;

		}



		memalloc_retry_wait(GFP_NOFS);

	}

fs/btrfs/ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -4356,6 +4356,7 @@ static int _btrfs_ioctl_send(struct inode *inode, void __user *argp, bool compat 
		arg->clone_sources = compat_ptr(args32.clone_sources);

		arg->parent_root = args32.parent_root;

		arg->flags = args32.flags;

		arg->version = args32.version;

		memcpy(arg->reserved, args32.reserved,

		       sizeof(args32.reserved));

#else

fs/btrfs/ref-verify.c

+2 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info, 
			dump_ref_action(fs_info, ra);

			kfree(ref);

			kfree(ra);

			kfree(re);

			goto out_unlock;

		} else if (be->num_refs == 0) {

			btrfs_err(fs_info,
@@ -803,6 +804,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info, 
			dump_ref_action(fs_info, ra);

			kfree(ref);

			kfree(ra);

			kfree(re);

			goto out_unlock;

		}

fs/btrfs/send.c

+1 −1
Original line number Diff line number Diff line
@@ -8158,7 +8158,7 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg) 
	}



	sctx->send_filp = fget(arg->send_fd);

	if (!sctx->send_filp) {

	if (!sctx->send_filp || !(sctx->send_filp->f_mode & FMODE_WRITE)) {

		ret = -EBADF;

		goto out;

	}