From: Greg Kroah-Hartman Date: Sun, 13 Dec 2015 01:15:40 +0000 (-0800) Subject: remove btrfs-check-unsupported-filters-in-balance-arguments.patch X-Git-Tag: v4.1.15~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=056aebd9d2d1d69fa0bcffb8835627afc1ab1da1;p=thirdparty%2Fkernel%2Fstable-queue.git remove btrfs-check-unsupported-filters-in-balance-arguments.patch --- diff --git a/queue-4.1/btrfs-check-unsupported-filters-in-balance-arguments.patch b/queue-4.1/btrfs-check-unsupported-filters-in-balance-arguments.patch deleted file mode 100644 index aaef7ed7fcd..00000000000 --- a/queue-4.1/btrfs-check-unsupported-filters-in-balance-arguments.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 849ef9286f30c88113906dc35f44a499c0cb385d Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Mon, 12 Oct 2015 16:55:54 +0200 -Subject: btrfs: check unsupported filters in balance arguments - -From: David Sterba - -commit 849ef9286f30c88113906dc35f44a499c0cb385d upstream. - -We don't verify that all the balance filter arguments supplemented by -the flags are actually known to the kernel. Thus we let it silently pass -and do nothing. - -At the moment this means only the 'limit' filter, but we're going to add -a few more soon so it's better to have that fixed. Also in older stable -kernels so that it works with newer userspace tools. - -Signed-off-by: David Sterba -Signed-off-by: Chris Mason -Signed-off-by: Greg Kroah-Hartman - ---- - fs/btrfs/ioctl.c | 5 +++++ - fs/btrfs/volumes.h | 8 ++++++++ - 2 files changed, 13 insertions(+) - ---- a/fs/btrfs/ioctl.c -+++ b/fs/btrfs/ioctl.c -@@ -4497,6 +4497,11 @@ locked: - goto out_bctl; - } - -+ 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 ---- a/fs/btrfs/volumes.h -+++ b/fs/btrfs/volumes.h -@@ -380,6 +380,14 @@ struct map_lookup { - BTRFS_BALANCE_ARGS_VRANGE | \ - BTRFS_BALANCE_ARGS_LIMIT) - -+#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 diff --git a/queue-4.1/series b/queue-4.1/series index 75282c391af..7c809cf1ed1 100644 --- a/queue-4.1/series +++ b/queue-4.1/series @@ -24,7 +24,6 @@ ipv6-add-complete-rcu-protection-around-np-opt.patch net-neighbour-fix-crash-at-dumping-device-agnostic-proxy-entries.patch ipv6-sctp-implement-sctp_v6_destroy_sock.patch net_sched-fix-qdisc_tree_decrease_qlen-races.patch -btrfs-check-unsupported-filters-in-balance-arguments.patch btrfs-fix-file-corruption-and-data-loss-after-cloning-inline-extents.patch btrfs-fix-truncation-of-compressed-and-inlined-extents.patch btrfs-fix-race-leading-to-incorrect-item-deletion-when-dropping-extents.patch diff --git a/queue-4.2/btrfs-check-unsupported-filters-in-balance-arguments.patch b/queue-4.2/btrfs-check-unsupported-filters-in-balance-arguments.patch deleted file mode 100644 index 578a3e92041..00000000000 --- a/queue-4.2/btrfs-check-unsupported-filters-in-balance-arguments.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 849ef9286f30c88113906dc35f44a499c0cb385d Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Mon, 12 Oct 2015 16:55:54 +0200 -Subject: btrfs: check unsupported filters in balance arguments - -From: David Sterba - -commit 849ef9286f30c88113906dc35f44a499c0cb385d upstream. - -We don't verify that all the balance filter arguments supplemented by -the flags are actually known to the kernel. Thus we let it silently pass -and do nothing. - -At the moment this means only the 'limit' filter, but we're going to add -a few more soon so it's better to have that fixed. Also in older stable -kernels so that it works with newer userspace tools. - -Signed-off-by: David Sterba -Signed-off-by: Chris Mason -Signed-off-by: Greg Kroah-Hartman - ---- - fs/btrfs/ioctl.c | 5 +++++ - fs/btrfs/volumes.h | 8 ++++++++ - 2 files changed, 13 insertions(+) - ---- a/fs/btrfs/ioctl.c -+++ b/fs/btrfs/ioctl.c -@@ -4652,6 +4652,11 @@ locked: - goto out_bctl; - } - -+ 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 ---- a/fs/btrfs/volumes.h -+++ b/fs/btrfs/volumes.h -@@ -384,6 +384,14 @@ struct map_lookup { - BTRFS_BALANCE_ARGS_VRANGE | \ - BTRFS_BALANCE_ARGS_LIMIT) - -+#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 diff --git a/queue-4.2/series b/queue-4.2/series index ccfe9a085be..554938d8efb 100644 --- a/queue-4.2/series +++ b/queue-4.2/series @@ -36,7 +36,6 @@ ipv6-sctp-implement-sctp_v6_destroy_sock.patch net_sched-fix-qdisc_tree_decrease_qlen-races.patch via-rhine-fix-vlan-receive-handling-regression.patch btrfs-fix-resending-received-snapshot-with-parent.patch -btrfs-check-unsupported-filters-in-balance-arguments.patch btrfs-fix-file-corruption-and-data-loss-after-cloning-inline-extents.patch btrfs-fix-truncation-of-compressed-and-inlined-extents.patch btrfs-fix-regression-when-running-delayed-references.patch diff --git a/queue-4.3/btrfs-check-unsupported-filters-in-balance-arguments.patch b/queue-4.3/btrfs-check-unsupported-filters-in-balance-arguments.patch deleted file mode 100644 index 164a9ba0ae4..00000000000 --- a/queue-4.3/btrfs-check-unsupported-filters-in-balance-arguments.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 849ef9286f30c88113906dc35f44a499c0cb385d Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Mon, 12 Oct 2015 16:55:54 +0200 -Subject: btrfs: check unsupported filters in balance arguments - -From: David Sterba - -commit 849ef9286f30c88113906dc35f44a499c0cb385d upstream. - -We don't verify that all the balance filter arguments supplemented by -the flags are actually known to the kernel. Thus we let it silently pass -and do nothing. - -At the moment this means only the 'limit' filter, but we're going to add -a few more soon so it's better to have that fixed. Also in older stable -kernels so that it works with newer userspace tools. - -Signed-off-by: David Sterba -Signed-off-by: Chris Mason -Signed-off-by: Greg Kroah-Hartman - ---- - fs/btrfs/ioctl.c | 5 +++++ - fs/btrfs/volumes.h | 8 ++++++++ - 2 files changed, 13 insertions(+) - ---- a/fs/btrfs/ioctl.c -+++ b/fs/btrfs/ioctl.c -@@ -4644,6 +4644,11 @@ locked: - goto out_bctl; - } - -+ 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 ---- a/fs/btrfs/volumes.h -+++ b/fs/btrfs/volumes.h -@@ -384,6 +384,14 @@ struct map_lookup { - BTRFS_BALANCE_ARGS_VRANGE | \ - BTRFS_BALANCE_ARGS_LIMIT) - -+#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 diff --git a/queue-4.3/series b/queue-4.3/series index b3803aed1a0..38e0e2544c3 100644 --- a/queue-4.3/series +++ b/queue-4.3/series @@ -43,7 +43,6 @@ ipv6-sctp-implement-sctp_v6_destroy_sock.patch openvswitch-fix-hangup-on-vxlan-gre-geneve-device-deletion.patch net_sched-fix-qdisc_tree_decrease_qlen-races.patch btrfs-fix-resending-received-snapshot-with-parent.patch -btrfs-check-unsupported-filters-in-balance-arguments.patch btrfs-fix-file-corruption-and-data-loss-after-cloning-inline-extents.patch btrfs-fix-truncation-of-compressed-and-inlined-extents.patch btrfs-fix-regression-when-running-delayed-references.patch