diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-04 07:43:36 +0100 |
|---|---|---|
| committer | Bob Copeland <me@bobcopeland.com> | 2011-03-05 22:24:12 +0100 |
| commit | 31be83aeaee22fa165862ad449c7131ceaf1cf91 (patch) | |
| tree | c63e3f3956c63aacfb438e0edb13402cdc16d8f3 /fs | |
| parent | omfs: merge unlink() and rmdir(), close leak in rename() (diff) | |
| download | linux-31be83aeaee22fa165862ad449c7131ceaf1cf91.tar.xz linux-31be83aeaee22fa165862ad449c7131ceaf1cf91.zip | |
omfs: make readdir stop when filldir says so
filldir returning an error does *not* mean "skip this entry, try the
next one"...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/omfs/dir.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index fd91f629ceb8..de4ff29f1e05 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c @@ -361,9 +361,10 @@ static int omfs_fill_chain(struct file *filp, void *dirent, filldir_t filldir, res = filldir(dirent, oi->i_name, strnlen(oi->i_name, OMFS_NAMELEN), filp->f_pos, self, d_type); - if (res == 0) - filp->f_pos++; brelse(bh); + if (res < 0) + break; + filp->f_pos++; } out: return res; |