summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Behrens <sbehrens@giantdisaster.de>2012-03-30 13:58:32 +0200
committerDavid Sterba <dsterba@suse.cz>2012-04-18 19:22:38 +0200
commit25cd999e1a685dab65292afbe9fa24d790d8a859 (patch)
tree56e2c7ceefddd657046f87eca111e2265cf00141
parent5c84fc3c3914e9adfa6155a167c6c0c2709e6a62 (diff)
downloadop-kernel-dev-25cd999e1a685dab65292afbe9fa24d790d8a859.zip
op-kernel-dev-25cd999e1a685dab65292afbe9fa24d790d8a859.tar.gz
Btrfs: fix that check_int_data mount option was ignored
The bitfield member mount_opt was too small by one bit to hold the mount option that enabled to include data extents in the integrity checker. Since the same issue happened when the BTRFS_MOUNT_PANIC_ON_FATAL_ERROR option was added (git rebase silently merges so that the increase of the size of the bitfield member is lost), the bit limit was removed entirely. Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
-rw-r--r--fs/btrfs/ctree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 5b8ef8e..ec42a24 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1078,7 +1078,7 @@ struct btrfs_fs_info {
* is required instead of the faster short fsync log commits
*/
u64 last_trans_log_full_commit;
- unsigned long mount_opt:21;
+ unsigned long mount_opt;
unsigned long compress_type:4;
u64 max_inline;
u64 alloc_start;
OpenPOWER on IntegriCloud