diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-01-16 11:25:54 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-01-16 11:25:54 -0500 |
| commit | f892436eb2c3223fecda614a64d51f36f6ec2245 (patch) | |
| tree | 75001db8c8b7fad547cbd4e99494727287598c1c /fs/btrfs/disk-io.c | |
| parent | 26c79f6ba0ccdc4bbc8ef8721406d37e9178e30b (diff) | |
| parent | 3a39c18d63fec35f49df577d4b2a4e29c2212f22 (diff) | |
Merge branch 'lzo-support' of git://repo.or.cz/linux-btrfs-devel into btrfs-38
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index a5d2249e6da5..f88eb2ce7919 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -1744,10 +1744,10 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
| 1744 | } | 1744 | } |
| 1745 | 1745 | ||
| 1746 | features = btrfs_super_incompat_flags(disk_super); | 1746 | features = btrfs_super_incompat_flags(disk_super); |
| 1747 | if (!(features & BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF)) { | 1747 | features |= BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF; |
| 1748 | features |= BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF; | 1748 | if (tree_root->fs_info->compress_type & BTRFS_COMPRESS_LZO) |
| 1749 | btrfs_set_super_incompat_flags(disk_super, features); | 1749 | features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO; |
| 1750 | } | 1750 | btrfs_set_super_incompat_flags(disk_super, features); |
| 1751 | 1751 | ||
| 1752 | features = btrfs_super_compat_ro_flags(disk_super) & | 1752 | features = btrfs_super_compat_ro_flags(disk_super) & |
| 1753 | ~BTRFS_FEATURE_COMPAT_RO_SUPP; | 1753 | ~BTRFS_FEATURE_COMPAT_RO_SUPP; |