diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-09 12:54:22 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-09 12:58:33 -0500 |
| commit | 671330c6373d8238e8eb214eae0149c619a3a412 (patch) | |
| tree | 8c85fca14214740128ae3683936f5fd912c34485 | |
| parent | 9d3f6be80f7f9f68a85ea1135c742e66703cea0d (diff) | |
bcachefs: fixes for bch2_dev_set_state()
| -rw-r--r-- | fs/bcachefs/super.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c index 84d1381546cf..2b0542284982 100644 --- a/fs/bcachefs/super.c +++ b/fs/bcachefs/super.c @@ -1240,7 +1240,8 @@ bool bch2_dev_state_allowed(struct bch_fs *c, struct bch_dev *ca, /* do we have enough devices to write to? */ for_each_member_device(ca2, c, i) - nr_rw += ca2->mi.state == BCH_MEMBER_STATE_RW; + if (ca2 != ca) + nr_rw += ca2->mi.state == BCH_MEMBER_STATE_RW; required = max(!(flags & BCH_FORCE_IF_METADATA_DEGRADED) ? c->opts.metadata_replicas @@ -1249,7 +1250,7 @@ bool bch2_dev_state_allowed(struct bch_fs *c, struct bch_dev *ca, ? c->opts.data_replicas : c->opts.data_replicas_required); - return nr_rw - 1 <= required; + return nr_rw >= required; case BCH_MEMBER_STATE_FAILED: case BCH_MEMBER_STATE_SPARE: if (ca->mi.state != BCH_MEMBER_STATE_RW && @@ -1346,12 +1347,8 @@ int __bch2_dev_set_state(struct bch_fs *c, struct bch_dev *ca, if (!bch2_dev_state_allowed(c, ca, new_state, flags)) return -EINVAL; - if (new_state == BCH_MEMBER_STATE_RW) { - if (__bch2_dev_read_write(c, ca)) - return -ENOMEM; - } else { + if (new_state != BCH_MEMBER_STATE_RW) __bch2_dev_read_only(c, ca); - } bch_notice(ca, "%s", bch2_dev_state[new_state]); @@ -1361,6 +1358,9 @@ int __bch2_dev_set_state(struct bch_fs *c, struct bch_dev *ca, bch2_write_super(c); mutex_unlock(&c->sb_lock); + if (new_state == BCH_MEMBER_STATE_RW) + return __bch2_dev_read_write(c, ca) ? -ENOMEM : 0; + return 0; } |