Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18172b10 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: extract fuse_emit() helper 



Prepare for cache filling by introducing a helper for emitting a single
directory entry.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 6433b899

fs/fuse/readdir.c

+9 −4
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ static bool fuse_use_readdirplus(struct inode *dir, struct dir_context *ctx) 
	return false;

}



static bool fuse_emit(struct file *file, struct dir_context *ctx,

		      struct fuse_dirent *dirent)

{

	return dir_emit(ctx, dirent->name, dirent->namelen, dirent->ino,

			dirent->type);

}



static int parse_dirfile(char *buf, size_t nbytes, struct file *file,

			 struct dir_context *ctx)

{
@@ -39,8 +46,7 @@ static int parse_dirfile(char *buf, size_t nbytes, struct file *file, 
		if (memchr(dirent->name, '/', dirent->namelen) != NULL)

			return -EIO;



		if (!dir_emit(ctx, dirent->name, dirent->namelen,

			       dirent->ino, dirent->type))

		if (!fuse_emit(file, ctx, dirent))

			break;



		buf += reclen;
@@ -183,8 +189,7 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file, 
			   we need to send a FORGET for each of those

			   which we did not link.

			*/

			over = !dir_emit(ctx, dirent->name, dirent->namelen,

				       dirent->ino, dirent->type);

			over = !fuse_emit(file, ctx, dirent);

			if (!over)

				ctx->pos = dirent->off;

		}