From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 4 Mar 2011 06:43:36 +0000 (-0500)
Subject: omfs: make readdir stop when filldir says so
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31be83aeaee22fa165862ad449c7131ceaf1cf91;p=linux-beck.git

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>
---

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;