From: Chris Mason <clm@fb.com>
Date: Tue, 26 Jan 2016 00:43:13 +0000 (-0800)
Subject: Merge branch 'fix/fst-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v4.9.8~2605^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b5aa88c861cf0e4156e490009e2018d4fc81109;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branch 'fix/fst-sysfs' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5

Signed-off-by: Chris Mason <clm@fb.com>
---

6b5aa88c861cf0e4156e490009e2018d4fc81109
diff --cc fs/btrfs/super.c
index a8e049a,5a1bab1..49b42410
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -485,7 -478,9 +486,10 @@@ int btrfs_parse_options(struct btrfs_ro
  				btrfs_clear_opt(info->mount_opt, NODATACOW);
  				btrfs_clear_opt(info->mount_opt, NODATASUM);
  				btrfs_set_fs_incompat(info, COMPRESS_LZO);
+ 				btrfs_sysfs_feature_update(root->fs_info,
+ 					BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO,
+ 					FEAT_INCOMPAT);
 +				no_compress = 0;
  			} else if (strncmp(args[0].from, "no", 2) == 0) {
  				compress_type = "no";
  				btrfs_clear_opt(info->mount_opt, COMPRESS);