Commit 6aa8ca4d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs fixes from Chris Mason:
 "I have two more bug fixes for btrfs.

  My commit fixes a bug we hit last week at FB, a combination of lots of
  hard links and an admin command to resolve inode numbers.

  Dave is adding checks to make sure balance on current kernels ignores
  filters it doesn't understand.  The penalty for being wrong is just
  doing more work (not crashing etc), but it's a good fix"

* 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix use after free iterating extrefs
  btrfs: check unsupported filters in balance arguments
parents 59bcce12 dc6c5fb3

fs/btrfs/backref.c

+3 −5
Original line number Diff line number Diff line
@@ -1828,7 +1828,6 @@ static int iterate_inode_extrefs(u64 inum, struct btrfs_root *fs_root, 
	int found = 0;

	struct extent_buffer *eb;

	struct btrfs_inode_extref *extref;

	struct extent_buffer *leaf;

	u32 item_size;

	u32 cur_offset;

	unsigned long ptr;
@@ -1856,9 +1855,8 @@ static int iterate_inode_extrefs(u64 inum, struct btrfs_root *fs_root, 
		btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);

		btrfs_release_path(path);



		leaf = path->nodes[0];

		item_size = btrfs_item_size_nr(leaf, slot);

		ptr = btrfs_item_ptr_offset(leaf, slot);

		item_size = btrfs_item_size_nr(eb, slot);

		ptr = btrfs_item_ptr_offset(eb, slot);

		cur_offset = 0;



		while (cur_offset < item_size) {
@@ -1872,7 +1870,7 @@ static int iterate_inode_extrefs(u64 inum, struct btrfs_root *fs_root, 
			if (ret)

				break;



			cur_offset += btrfs_inode_extref_name_len(leaf, extref);

			cur_offset += btrfs_inode_extref_name_len(eb, extref);

			cur_offset += sizeof(*extref);

		}

		btrfs_tree_read_unlock_blocking(eb);

fs/btrfs/ioctl.c

+5 −0
Original line number Diff line number Diff line
@@ -4639,6 +4639,11 @@ locked: 
		bctl->flags |= BTRFS_BALANCE_TYPE_MASK;

	}



	if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK | BTRFS_BALANCE_TYPE_MASK)) {

		ret = -EINVAL;

		goto out_bargs;

	}



do_balance:

	/*

	 * Ownership of bctl and mutually_exclusive_operation_running

fs/btrfs/volumes.h

+8 −0
Original line number Diff line number Diff line
@@ -376,6 +376,14 @@ struct map_lookup { 
#define BTRFS_BALANCE_ARGS_VRANGE	(1ULL << 4)

#define BTRFS_BALANCE_ARGS_LIMIT	(1ULL << 5)



#define BTRFS_BALANCE_ARGS_MASK			\

	(BTRFS_BALANCE_ARGS_PROFILES |		\

	 BTRFS_BALANCE_ARGS_USAGE |		\

	 BTRFS_BALANCE_ARGS_DEVID | 		\

	 BTRFS_BALANCE_ARGS_DRANGE |		\

	 BTRFS_BALANCE_ARGS_VRANGE |		\

	 BTRFS_BALANCE_ARGS_LIMIT)



/*

 * Profile changing flags.  When SOFT is set we won't relocate chunk if

 * it already has the target profile (even though it may be

CRA Git | Maintained and supported by SUSTech CRA and CCSE