From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from plane.gmane.org ([80.91.229.3]:36030 "EHLO plane.gmane.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751901AbbLLVrM (ORCPT <rfc822;stable@vger.kernel.org>);
	Sat, 12 Dec 2015 16:47:12 -0500
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <glks-stable3@m.gmane.org>)
	id 1a7s0T-0003Wp-ET
	for stable@vger.kernel.org; Sat, 12 Dec 2015 22:47:09 +0100
Received: from p4ff58543.dip0.t-ipconnect.de ([79.245.133.67])
        by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
        id 1AlnuQ-0007hv-00
        for <stable@vger.kernel.org>; Sat, 12 Dec 2015 22:47:09 +0100
Received: from holger.hoffstaette by p4ff58543.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian))
        id 1AlnuQ-0007hv-00
        for <stable@vger.kernel.org>; Sat, 12 Dec 2015 22:47:09 +0100
To: stable@vger.kernel.org
From: Holger =?iso-8859-1?q?Hoffst=E4tte?=
	<holger.hoffstaette@googlemail.com>
Subject: Re: Patch "btrfs: check unsupported filters in balance arguments"
 has been added to the 4.1-stable tree
Date: Sat, 12 Dec 2015 21:47:03 +0000 (UTC)
Message-ID: <pan.2015.12.12.21.47.03@googlemail.com>
References: <1449854366214161@kroah.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Fri, 11 Dec 2015 09:19:26 -0800, gregkh wrote:

> This is a note to let you know that I've just added the patch titled
> 
>     btrfs: check unsupported filters in balance arguments
> 
> to the 4.1-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> The filename of the patch is:
>      btrfs-check-unsupported-filters-in-balance-arguments.patch
> and it can be found in the queue-4.1 subdirectory.

This patch was previously already added to 4.1.12 & 4.2.5 and should be
dropped from all queues. 4.3 has it out of the box, so no need to add it
there either.

Not sure how but apparently you managed to apply it twice, so e.g.
fs/btrfs/ioctl.c:4604 from 4.1.15-rc1 now looks like:

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

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

cheers,
Holger