Merge branch 'fix/fst-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

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

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc fs/btrfs/super.c
index a8e049a,5a1bab1..49b4241
--- 1/fs/btrfs/super.c
--- 2/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);

diff --cc fs/btrfs/volumes.c
Simple merge