From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 7 Jun 2018 14:41:59 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.17.1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb756d708b2a48e1266466c34d3e71bd924a7013;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	btrfs-define-super_flag_metadump_v2.patch
---

diff --git a/queue-4.9/btrfs-define-super_flag_metadump_v2.patch b/queue-4.9/btrfs-define-super_flag_metadump_v2.patch
new file mode 100644
index 00000000000..8ec53d01bf2
--- /dev/null
+++ b/queue-4.9/btrfs-define-super_flag_metadump_v2.patch
@@ -0,0 +1,44 @@
+From e2731e55884f2138a252b0a3d7b24d57e49c3c59 Mon Sep 17 00:00:00 2001
+From: Anand Jain <Anand.Jain@oracle.com>
+Date: Tue, 9 Jan 2018 09:05:41 +0800
+Subject: btrfs: define SUPER_FLAG_METADUMP_V2
+
+From: Anand Jain <Anand.Jain@oracle.com>
+
+commit e2731e55884f2138a252b0a3d7b24d57e49c3c59 upstream.
+
+btrfs-progs uses super flag bit BTRFS_SUPER_FLAG_METADUMP_V2 (1ULL << 34).
+So just define that in kernel so that we know its been used.
+
+Signed-off-by: Anand Jain <anand.jain@oracle.com>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/btrfs/disk-io.c              |    3 ++-
+ include/uapi/linux/btrfs_tree.h |    1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/fs/btrfs/disk-io.c
++++ b/fs/btrfs/disk-io.c
+@@ -59,7 +59,8 @@
+ 				 BTRFS_HEADER_FLAG_RELOC |\
+ 				 BTRFS_SUPER_FLAG_ERROR |\
+ 				 BTRFS_SUPER_FLAG_SEEDING |\
+-				 BTRFS_SUPER_FLAG_METADUMP)
++				 BTRFS_SUPER_FLAG_METADUMP |\
++				 BTRFS_SUPER_FLAG_METADUMP_V2)
+ 
+ static const struct extent_io_ops btree_extent_io_ops;
+ static void end_workqueue_fn(struct btrfs_work *work);
+--- a/include/uapi/linux/btrfs_tree.h
++++ b/include/uapi/linux/btrfs_tree.h
+@@ -452,6 +452,7 @@ struct btrfs_free_space_header {
+ 
+ #define BTRFS_SUPER_FLAG_SEEDING	(1ULL << 32)
+ #define BTRFS_SUPER_FLAG_METADUMP	(1ULL << 33)
++#define BTRFS_SUPER_FLAG_METADUMP_V2	(1ULL << 34)
+ 
+ 
+ /*
diff --git a/queue-4.9/series b/queue-4.9/series
index e2af6cadb48..94c16cd5226 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -2,3 +2,4 @@ tpm-do-not-suspend-resume-if-power-stays-on.patch
 tpm-self-test-failure-should-not-cause-suspend-to-fail.patch
 mmap-introduce-sane-default-mmap-limits.patch
 mmap-relax-file-size-limit-for-regular-files.patch
+btrfs-define-super_flag_metadump_v2.patch