diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2017-10-25 10:34:27 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2017-10-25 10:34:27 -0400 |
commit | c6cdd51404b7ac12dd95173ddfc548c59ecf037f (patch) | |
tree | 441a64f205973c6d411a42e54696056d714b362d /fs | |
parent | bb176f67090ca54869fc1262c913aa69d2ede070 (diff) |
fuse: fix READDIRPLUS skipping an entry
Marios Titas running a Haskell program noticed a problem with fuse's
readdirplus: when it is interrupted by a signal, it skips one directory
entry.
The reason is that fuse erronously updates ctx->pos after a failed
dir_emit().
The issue originates from the patch adding readdirplus support.
Reported-by: Jakob Unterwurzacher <jakobunt@gmail.com>
Tested-by: Marios Titas <redneb@gmx.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 0b05b18381ee ("fuse: implement NFS-like readdirplus support")
Cc: <stable@vger.kernel.org> # v3.9
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fuse/dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 622081b97426..24967382a7b1 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c | |||
@@ -1308,7 +1308,8 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file, | |||
1308 | */ | 1308 | */ |
1309 | over = !dir_emit(ctx, dirent->name, dirent->namelen, | 1309 | over = !dir_emit(ctx, dirent->name, dirent->namelen, |
1310 | dirent->ino, dirent->type); | 1310 | dirent->ino, dirent->type); |
1311 | ctx->pos = dirent->off; | 1311 | if (!over) |
1312 | ctx->pos = dirent->off; | ||
1312 | } | 1313 | } |
1313 | 1314 | ||
1314 | buf += reclen; | 1315 | buf += reclen; |