diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-03-01 01:45:15 -0900 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-03-08 02:34:33 -0900 |
| commit | 06b73dbd7ffc0296b2ecea8d3bc55bfeb72d7f2a (patch) | |
| tree | 1ba37985a18eb2d9a9616ee160c82339e23e2160 /libbcache/blockdev.c | |
| parent | 171ee48e57be78f4e95954c99851553fa523bf91 (diff) | |
cmd_migratedisk-format-changes
Diffstat (limited to 'libbcache/blockdev.c')
| -rw-r--r-- | libbcache/blockdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbcache/blockdev.c b/libbcache/blockdev.c index 82b07f5..ba2e9a8 100644 --- a/libbcache/blockdev.c +++ b/libbcache/blockdev.c @@ -375,6 +375,8 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c) bool found; int ret; + lockdep_assert_held(&c->state_lock); + bdevname(dc->disk_sb.bdev, buf); if (memcmp(&dc->disk_sb.sb->set_uuid, @@ -387,11 +389,8 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c) return -EINVAL; } - if (!test_bit(BCH_FS_RUNNING, &c->flags)) - return 0; - - if (test_bit(BCH_FS_STOPPING, &c->flags)) { - pr_err("Can't attach %s: shutting down", buf); + if (!bch_fs_running(c)) { + pr_err("Can't attach %s: not running", buf); return -EINVAL; } @@ -497,6 +496,7 @@ void bch_attach_backing_devs(struct cache_set *c) struct cached_dev *dc, *t; lockdep_assert_held(&bch_register_lock); + lockdep_assert_held(&c->state_lock); list_for_each_entry_safe(dc, t, &uncached_devices, list) bch_cached_dev_attach(dc, c); @@ -742,7 +742,7 @@ int bch_blockdev_volumes_start(struct cache_set *c) struct bkey_s_c_inode_blockdev inode; int ret = 0; - if (test_bit(BCH_FS_STOPPING, &c->flags)) + if (!bch_fs_running(c)) return -EINVAL; for_each_btree_key(&iter, c, BTREE_ID_INODES, POS_MIN, k) { |