Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (37902bc1) · Commits · 戴 / test

Pull btrfs fixes from Chris Mason: "I have two more small fixes this week: Qu's fix avoids unneeded COW during fallocate, and Christian found a memory leak in the error handling of an earlier fix" * 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: fix possible leak in btrfs_ioctl_balance() btrfs: Avoid truncate tailing page if fallocate range doesn't exceed inode size

fs/btrfs/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2584,7 +2584,7 @@ static long btrfs_fallocate(struct file *file, int mode,
		alloc_start);
		if (ret)
		goto out;
		} else {
		} else if (offset + len > inode->i_size) {
		/*
		* If we are fallocating from the end of the file onward we
		* need to zero out the end of the page if i_size lands in the

fs/btrfs/ioctl.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -4641,7 +4641,7 @@ locked:

		if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK \| BTRFS_BALANCE_TYPE_MASK)) {
		ret = -EINVAL;
		goto out_bargs;
		goto out_bctl;
		}

		do_balance:
		@@ -4655,12 +4655,15 @@ do_balance:
		need_unlock = false;

		ret = btrfs_balance(bctl, bargs);
		bctl = NULL;

		if (arg) {
		if (copy_to_user(arg, bargs, sizeof(*bargs)))
		ret = -EFAULT;
		}

		out_bctl:
		kfree(bctl);
		out_bargs:
		kfree(bargs);
		out_unlock:

Admin message