Commit a9af9835 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse fix from Miklos Szeredi:
 "This fixes a longstanding bug, which can be triggered by interrupting
  a directory reading syscall"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix READDIRPLUS skipping an entry
parents 11224e1f c6cdd514
...@@ -1308,7 +1308,8 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file, ...@@ -1308,7 +1308,8 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file,
*/ */
over = !dir_emit(ctx, dirent->name, dirent->namelen, over = !dir_emit(ctx, dirent->name, dirent->namelen,
dirent->ino, dirent->type); dirent->ino, dirent->type);
ctx->pos = dirent->off; if (!over)
ctx->pos = dirent->off;
} }
buf += reclen; buf += reclen;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment