|
@@ -1114,7 +1114,7 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec
|
|
|
|
|
|
static int btrfs_fill_super(struct super_block *sb,
|
|
static int btrfs_fill_super(struct super_block *sb,
|
|
struct btrfs_fs_devices *fs_devices,
|
|
struct btrfs_fs_devices *fs_devices,
|
|
- void *data, int silent)
|
|
|
|
|
|
+ void *data)
|
|
{
|
|
{
|
|
struct inode *inode;
|
|
struct inode *inode;
|
|
struct btrfs_fs_info *fs_info = btrfs_sb(sb);
|
|
struct btrfs_fs_info *fs_info = btrfs_sb(sb);
|
|
@@ -1611,8 +1611,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
|
|
} else {
|
|
} else {
|
|
snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
|
|
snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
|
|
btrfs_sb(s)->bdev_holder = fs_type;
|
|
btrfs_sb(s)->bdev_holder = fs_type;
|
|
- error = btrfs_fill_super(s, fs_devices, data,
|
|
|
|
- flags & MS_SILENT ? 1 : 0);
|
|
|
|
|
|
+ error = btrfs_fill_super(s, fs_devices, data);
|
|
}
|
|
}
|
|
if (error) {
|
|
if (error) {
|
|
deactivate_locked_super(s);
|
|
deactivate_locked_super(s);
|