diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-05-19 15:59:37 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-05-19 16:01:51 -0400 |
| commit | 8cc7d4928198f843fa6d790a615405140fc992d3 (patch) | |
| tree | d2e7de8e9e120e2228017817f5476f8e9e73c74f /libbcachefs/recovery.c | |
| parent | 0766bee8fdf3973953fd3184f63dfe2a0760c08d (diff) | |
cmd_unlock: Add -k argument to specify keyring
This adds a new argument (-k) to cmd_unlock for specifying the keyring
to add to. The default is user, but user_session and session can also be
specified.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'libbcachefs/recovery.c')
| -rw-r--r-- | libbcachefs/recovery.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c index ff483ff3..36ab2e3b 100644 --- a/libbcachefs/recovery.c +++ b/libbcachefs/recovery.c @@ -1256,11 +1256,10 @@ use_clean: bch_info(c, "checking lrus"); err = "error checking lrus"; - ret = bch2_check_lrus(c, true); + ret = bch2_check_lrus(c); if (ret) goto err; bch_verbose(c, "done checking lrus"); - set_bit(BCH_FS_CHECK_LRUS_DONE, &c->flags); bch_info(c, "checking alloc to lru refs"); @@ -1268,12 +1267,8 @@ use_clean: ret = bch2_check_alloc_to_lru_refs(c); if (ret) goto err; - set_bit(BCH_FS_CHECK_ALLOC_TO_LRU_REFS_DONE, &c->flags); - - ret = bch2_check_lrus(c, true); - if (ret) - goto err; bch_verbose(c, "done checking alloc to lru refs"); + set_bit(BCH_FS_CHECK_ALLOC_TO_LRU_REFS_DONE, &c->flags); } else { set_bit(BCH_FS_MAY_GO_RW, &c->flags); set_bit(BCH_FS_INITIAL_GC_DONE, &c->flags); |