From: Kent Overstreet Date: Sun, 17 Mar 2019 20:49:59 +0000 (-0400) Subject: bcachefs: Fix a deadlock X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7c648fe8991a267886b262e8988546ec87ad926e;p=linux.git bcachefs: Fix a deadlock Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index 955831a508240..38bf75b6bc2d6 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -96,11 +96,11 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags) break; } + bch2_trans_exit(&trans); + bch2_replicas_gc_end(c, ret); mutex_unlock(&c->replicas_gc_lock); - bch2_trans_exit(&trans); - return ret; }