Commit f8b01473 authored by Ariel Miculas's avatar Ariel Miculas Committed by Kent Overstreet
Browse files

bcachefs: bch2_dir_emit() - fix directory reads in the fuse driver 



Commit 0c0cbfdb dropped the ctx->pos
update before the call to dir_emit. This breaks the userspace
implementation, causing the directory reads to be stuck in an infinite
loop. This doesn't happen in the kernel because the vfs handles the
updates to ctx->pos, but in the fuse implementation nobody updates
it.

Signed-off-by: default avatarAriel Miculas <ariel.miculas@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 7ed122ae

fs/bcachefs/dirent.c

+8 −0
Original line number Diff line number Diff line
@@ -534,6 +534,14 @@ int bch2_empty_dir_trans(struct btree_trans *trans, subvol_inum dir) 
static int bch2_dir_emit(struct dir_context *ctx, struct bkey_s_c_dirent d, subvol_inum target)

{

	struct qstr name = bch2_dirent_get_name(d);

	/*

	 * Although not required by the kernel code, updating ctx->pos is needed

	 * for the bcachefs FUSE driver. Without this update, the FUSE

	 * implementation will be stuck in an infinite loop when reading

	 * directories (via the bcachefs_fuse_readdir callback).

	 * In kernel space, ctx->pos is updated by the VFS code.

	 */

	ctx->pos = d.k->p.offset;

	bool ret = dir_emit(ctx, name.name,

		      name.len,

		      target.inum,