commit 2233f31aade393641f0eaed43a71110e629bb900
author Al Viro <viro@zeniv.linux.org.uk> Wed May 22 21:44:23 2013 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sat Jun 29 12:57:04 2013 +0400
tree 3993793028cb6c8dae41d407cb2217d221d9399c
parent 2de5f059c4422e357b7df021b487a37b1d61356b

[readdir] ->readdir() is gone

everything's converted to ->iterate()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/readdir.c

diff --git a/fs/readdir.c b/fs/readdir.c
index 5d6578a..a6245c9 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -24,7 +24,7 @@
 {
 	struct inode *inode = file_inode(file);
 	int res = -ENOTDIR;
-	if (!file->f_op || (!file->f_op->readdir && !file->f_op->iterate))
+	if (!file->f_op || !file->f_op->iterate)
 		goto out;
 
 	res = security_file_permission(file, MAY_READ);
@@ -37,14 +37,9 @@
 
 	res = -ENOENT;
 	if (!IS_DEADDIR(inode)) {
-		if (file->f_op->iterate) {
-			ctx->pos = file->f_pos;
-			res = file->f_op->iterate(file, ctx);
-			file->f_pos = ctx->pos;
-		} else {
-			res = file->f_op->readdir(file, ctx, ctx->actor);
-			ctx->pos = file->f_pos;
-		}
+		ctx->pos = file->f_pos;
+		res = file->f_op->iterate(file, ctx);
+		file->f_pos = ctx->pos;
 		file_accessed(file);
 	}
 	mutex_unlock(&inode->i_mutex);