public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bcachefs: Don't fail mount if device has been removed

Browse source 
Also - make sure to show the devices we actually have open in /proc

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2020-09-06 22:58:28 -04:00 • committed by Kent Overstreet
parent ca73852a13
commit 625104ea21
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fs/bcachefs/fs.c
View file

@ -1428,6 +1428,24 @@ static int bch2_remount(struct super_block *sb, int *flags, char *data)
return ret; return ret;
} }
static int bch2_show_devname(struct seq_file *seq, struct dentry *root)
{
struct bch_fs *c = root->d_sb->s_fs_info;
struct bch_dev *ca;
unsigned i;
bool first = true;
for_each_online_member(ca, c, i) {
if (!first)
seq_putc(seq, ':');
first = false;
seq_puts(seq, "/dev/");
seq_puts(seq, ca->name);
}
return 0;
}
static int bch2_show_options(struct seq_file *seq, struct dentry *root) static int bch2_show_options(struct seq_file *seq, struct dentry *root)
{ {
struct bch_fs *c = root->d_sb->s_fs_info; struct bch_fs *c = root->d_sb->s_fs_info;
@ -1451,7 +1469,6 @@ static int bch2_show_options(struct seq_file *seq, struct dentry *root)
} }
return 0; return 0;
} }
static const struct super_operations bch_super_operations = { static const struct super_operations bch_super_operations = {
@ -1461,6 +1478,7 @@ static const struct super_operations bch_super_operations = {
.evict_inode = bch2_evict_inode, .evict_inode = bch2_evict_inode,
.sync_fs = bch2_sync_fs, .sync_fs = bch2_sync_fs,
.statfs = bch2_statfs, .statfs = bch2_statfs,
.show_devname = bch2_show_devname,
.show_options = bch2_show_options, .show_options = bch2_show_options,
.remount_fs = bch2_remount, .remount_fs = bch2_remount,
#if 0 #if 0

16
fs/bcachefs/super.c
View file

@ -1790,7 +1790,6 @@ err:
/* return with ref on ca->ref: */ /* return with ref on ca->ref: */
struct bch_dev *bch2_dev_lookup(struct bch_fs *c, const char *path) struct bch_dev *bch2_dev_lookup(struct bch_fs *c, const char *path)
{ {
struct bch_dev *ca; struct bch_dev *ca;
dev_t dev; dev_t dev;
unsigned i; unsigned i;
@ -1816,6 +1815,7 @@ struct bch_fs *bch2_fs_open(char * const *devices, unsigned nr_devices,
{ {
struct bch_sb_handle *sb = NULL; struct bch_sb_handle *sb = NULL;
struct bch_fs *c = NULL; struct bch_fs *c = NULL;
struct bch_sb_field_members *mi;
unsigned i, best_sb = 0; unsigned i, best_sb = 0;
const char *err; const char *err;
int ret = -ENOMEM; int ret = -ENOMEM;
@ -1851,10 +1851,22 @@ struct bch_fs *bch2_fs_open(char * const *devices, unsigned nr_devices,
le64_to_cpu(sb[best_sb].sb->seq)) le64_to_cpu(sb[best_sb].sb->seq))
best_sb = i; best_sb = i;
for (i = 0; i < nr_devices; i++) { mi = bch2_sb_get_members(sb[best_sb].sb);
i = 0;
while (i < nr_devices) {
if (i != best_sb &&
!bch2_dev_exists(sb[best_sb].sb, mi, sb[i].sb->dev_idx)) {
pr_info("%pg has been removed, skipping", sb[i].bdev);
bch2_free_super(&sb[i]);
array_remove_item(sb, nr_devices, i);
continue;
}
err = bch2_dev_in_fs(sb[best_sb].sb, sb[i].sb); err = bch2_dev_in_fs(sb[best_sb].sb, sb[i].sb);
if (err) if (err)
goto err_print; goto err_print;
i++;
} }
ret = -ENOMEM; ret = -ENOMEM;