Btrfs: set a incompat flag when setting default subvol
PATCH 1/1 Btrfs: set a incompat flag when setting default subvol
Older kernels would generally be able to still mount the filesystem with the default subvolume set, but it would result in a different volume being mounted, which could be an even more unpleasant suprise for users. So if you set your default subvolume, you can't go back to older kernels. Thanks,
Signed-off-by Josef Bacik <[email protected]>
--- fs/btrfs/ctree.h | 4 +++- fs/btrfs/ioctl.c | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletions(-)
fs/btrfs/ctree.h +3 -1
@@ -370,11 +370,13 @@ struct btrfs_super_block {* ones specified below then we will fail to mount */ #define BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF (1ULL << 0) +#define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (2ULL << 0)#define BTRFS_FEATURE_COMPAT_SUPP 0ULL#define BTRFS_FEATURE_COMPAT_RO_SUPP 0ULL#define BTRFS_FEATURE_INCOMPAT_SUPP \ - BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF + (BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF | \ + BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL)/* * A leaf is full of items. offset and size tell us where to find
fs/btrfs/ioctl.c +8 -0
@@ -1563,6 +1563,8 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)struct btrfs_path *path;struct btrfs_key location;struct btrfs_disk_key disk_key; +struct btrfs_super_block *disk_super; +u64 features;u64 objectid =0 ;u64 dir_id;
@@ -1610,6 +1612,12 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)btrfs_mark_buffer_dirty (path->nodes[0 ]);btrfs_free_path (path); + disk_super = &root->fs_info->super_copy; + features =btrfs_super_incompat_flags (disk_super); +if (!(features &BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL )) { + features |=BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL ; +btrfs_set_super_incompat_flags (disk_super, features); + }btrfs_end_transaction (trans, root);return 0 ;
Signature · 1 line
1.5.4.3