Commit 064a4a5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2024-01-26' of https://evilpiepirate.org/git/bcachefs 

Pull bcachefs fixes from Kent Overstreet:

 - fix for REQ_OP_FLUSH usage; this fixes filesystems going read only
   with -EOPNOTSUPP from the block layer.

   (this really should have gone in with the block layer patch causing
   the -EOPNOTSUPP, or should have gone in before).

 - fix an allocation in non-sleepable context

 - fix one source of srcu lock latency, on devices with terrible discard
   latency

 - fix a reattach_inode() issue in fsck

* tag 'bcachefs-2024-01-26' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: __lookup_dirent() works in snapshot, not subvol
  bcachefs: discard path uses unlock_long()
  bcachefs: fix incorrect usage of REQ_OP_FLUSH
  bcachefs: Add gfp flags param to bch2_prt_task_backtrace()
parents 8c6f6a76 d2fda304

fs/bcachefs/alloc_background.c

+1 −1
Original line number Diff line number Diff line
@@ -1715,7 +1715,7 @@ static int bch2_discard_one_bucket(struct btree_trans *trans, 
		 * This works without any other locks because this is the only

		 * thread that removes items from the need_discard tree

		 */

		bch2_trans_unlock(trans);

		bch2_trans_unlock_long(trans);

		blkdev_issue_discard(ca->disk_sb.bdev,

				     k.k->p.offset * ca->mi.bucket_size,

				     ca->mi.bucket_size,

fs/bcachefs/btree_locking.c

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static noinline void print_cycle(struct printbuf *out, struct lock_graph *g) 
			continue;



		bch2_btree_trans_to_text(out, i->trans);

		bch2_prt_task_backtrace(out, task, i == g->g ? 5 : 1);

		bch2_prt_task_backtrace(out, task, i == g->g ? 5 : 1, GFP_NOWAIT);

	}

}
@@ -227,7 +227,7 @@ static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle) 
			prt_printf(&buf, "backtrace:");

			prt_newline(&buf);

			printbuf_indent_add(&buf, 2);

			bch2_prt_task_backtrace(&buf, trans->locking_wait.task, 2);

			bch2_prt_task_backtrace(&buf, trans->locking_wait.task, 2, GFP_NOWAIT);

			printbuf_indent_sub(&buf, 2);

			prt_newline(&buf);

		}

fs/bcachefs/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static ssize_t bch2_btree_transactions_read(struct file *file, char __user *buf, 
		prt_printf(&i->buf, "backtrace:");

		prt_newline(&i->buf);

		printbuf_indent_add(&i->buf, 2);

		bch2_prt_task_backtrace(&i->buf, task, 0);

		bch2_prt_task_backtrace(&i->buf, task, 0, GFP_KERNEL);

		printbuf_indent_sub(&i->buf, 2);

		prt_newline(&i->buf);

fs/bcachefs/fs-io.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void bch2_inode_flush_nocow_writes_async(struct bch_fs *c, 
			continue;



		bio = container_of(bio_alloc_bioset(ca->disk_sb.bdev, 0,

						    REQ_OP_FLUSH,

						    REQ_OP_WRITE|REQ_PREFLUSH,

						    GFP_KERNEL,

						    &c->nocow_flush_bioset),

				   struct nocow_flush, bio);

fs/bcachefs/fsck.c

+12 −11
Original line number Diff line number Diff line
@@ -119,22 +119,19 @@ static int lookup_inode(struct btree_trans *trans, u64 inode_nr, 
	if (!ret)

		*snapshot = iter.pos.snapshot;

err:

	bch_err_msg(trans->c, ret, "fetching inode %llu:%u", inode_nr, *snapshot);

	bch2_trans_iter_exit(trans, &iter);

	return ret;

}



static int __lookup_dirent(struct btree_trans *trans,

static int lookup_dirent_in_snapshot(struct btree_trans *trans,

			   struct bch_hash_info hash_info,

			   subvol_inum dir, struct qstr *name,

			   u64 *target, unsigned *type)

			   u64 *target, unsigned *type, u32 snapshot)

{

	struct btree_iter iter;

	struct bkey_s_c_dirent d;

	int ret;



	ret = bch2_hash_lookup(trans, &iter, bch2_dirent_hash_desc,

			       &hash_info, dir, name, 0);

	int ret = bch2_hash_lookup_in_snapshot(trans, &iter, bch2_dirent_hash_desc,

			       &hash_info, dir, name, 0, snapshot);

	if (ret)

		return ret;
@@ -225,15 +222,16 @@ static int lookup_lostfound(struct btree_trans *trans, u32 snapshot, 


	struct bch_inode_unpacked root_inode;

	struct bch_hash_info root_hash_info;

	ret = lookup_inode(trans, root_inum.inum, &root_inode, &snapshot);

	u32 root_inode_snapshot = snapshot;

	ret = lookup_inode(trans, root_inum.inum, &root_inode, &root_inode_snapshot);

	bch_err_msg(c, ret, "looking up root inode");

	if (ret)

		return ret;



	root_hash_info = bch2_hash_info_init(c, &root_inode);



	ret = __lookup_dirent(trans, root_hash_info, root_inum,

			      &lostfound_str, &inum, &d_type);

	ret = lookup_dirent_in_snapshot(trans, root_hash_info, root_inum,

			      &lostfound_str, &inum, &d_type, snapshot);

	if (bch2_err_matches(ret, ENOENT))

		goto create_lostfound;
@@ -250,7 +248,10 @@ static int lookup_lostfound(struct btree_trans *trans, u32 snapshot, 
	 * The bch2_check_dirents pass has already run, dangling dirents

	 * shouldn't exist here:

	 */

	return lookup_inode(trans, inum, lostfound, &snapshot);

	ret = lookup_inode(trans, inum, lostfound, &snapshot);

	bch_err_msg(c, ret, "looking up lost+found %llu:%u in (root inode %llu, snapshot root %u)",

		    inum, snapshot, root_inum.inum, bch2_snapshot_root(c, snapshot));

	return ret;



create_lostfound:

	/*