patches: openwrt: enable ACL by default and disable CONFIG_BTRFS_FS_CHECK_INTEGRITY

patches/openwrt/to-upstream/0023-kernel-btrfs-enable-ACL-and-CHECK_INTEGRITY.patch → patches/openwrt/to-upstream/0023-kernel-btrfs-enable-ACL.patch

-From 878df9ac8a21cd1176cb269bf98c19a7dd0450fd Mon Sep 17 00:00:00 2001
+From fd6883c2627cdeb94b435c2460848db29946828b Mon Sep 17 00:00:00 2001
 From: Josef Schlehofer <josef.schlehofer@nic.cz>
-Date: Sun, 12 May 2019 23:23:14 +0200
-Subject: [PATCH] kernel: btrfs: enable ACL and CHECK_INTEGRITY
+Date: Thu, 16 May 2019 17:23:12 +0200
+Subject: [PATCH] kernel: btrfs: enable ACL
 
-Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz>
+By default CONFIG_BTRFS_FS_POSIX_ACL is disabled, it should be enabled
+only when you enable CONFIG_FS_POSIX_ACL.
+
+Right now, when you enable CONFIG_FS_POSIX_ACL it will enable
+CONFIG_BTRFS_FS_POSIX_ACL, but it will be disabled once you install
+kmod-btrfs. This should prevent it.
+
+Btrfs has enabled by default ACL for mount option.
+
+See it here:
+https://cateee.net/lkddb/web-lkddb/BTRFS_FS_POSIX_ACL.html
+https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs(5)
 ---
- package/kernel/linux/modules/fs.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ package/kernel/linux/modules/fs.mk | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
-index ebf8677d93..651545bb9e 100644
+index ebf8677d93..e7acb2d24f 100644
 --- a/package/kernel/linux/modules/fs.mk
 +++ b/package/kernel/linux/modules/fs.mk
-@@ -67,8 +67,8 @@ define KernelPackage/fs-btrfs
+@@ -67,7 +67,6 @@ define KernelPackage/fs-btrfs
    DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +LINUX_4_14:kmod-lib-zstd
    KCONFIG:=\
  	CONFIG_BTRFS_FS \
 -	CONFIG_BTRFS_FS_POSIX_ACL=n \
--	CONFIG_BTRFS_FS_CHECK_INTEGRITY=n
-+	CONFIG_BTRFS_FS_POSIX_ACL=y \
-+	CONFIG_BTRFS_FS_CHECK_INTEGRITY=y
+ 	CONFIG_BTRFS_FS_CHECK_INTEGRITY=n
    FILES:=\
  	$(LINUX_DIR)/fs/btrfs/btrfs.ko
-   AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
 -- 
 2.20.1