Skip to content

Commit

Permalink
fuse: extract fuse_emit() helper
Browse files Browse the repository at this point in the history
Prepare for cache filling by introducing a helper for emitting a single
directory entry.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Miklos Szeredi committed Sep 28, 2018
1 parent 6433b89 commit 18172b1
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions fs/fuse/readdir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 18172b1

Please sign in to comment.