From: Kent Overstreet Date: Tue, 2 Apr 2024 05:03:58 +0000 (-0400) Subject: bcachefs: fix nocow lock deadlock X-Git-Tag: v6.9-rc3~31^2~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c42cd606e4f004e9ba36a05b9adb9e4eead5834a;p=thirdparty%2Fkernel%2Flinux.git bcachefs: fix nocow lock deadlock Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c index b564404dad711..34731ee0217f6 100644 --- a/fs/bcachefs/data_update.c +++ b/fs/bcachefs/data_update.c @@ -580,8 +580,7 @@ int bch2_data_update_init(struct btree_trans *trans, move_ctxt_wait_event(ctxt, (locked = bch2_bucket_nocow_trylock(&c->nocow_locks, PTR_BUCKET_POS(c, &p.ptr), 0)) || - (!atomic_read(&ctxt->read_sectors) && - !atomic_read(&ctxt->write_sectors))); + list_empty(&ctxt->ios)); if (!locked) bch2_bucket_nocow_lock(&c->nocow_locks,