1 files changed, 8 insertions, 13 deletions

diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 35b1c7bd18b7..e501ac3a49ff 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -349,18 +349,17 @@ static int cramfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 /*
  * Read a cramfs directory entry.
  */
-static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
+static int cramfs_readdir(struct file *file, struct dir_context *ctx)
 {
-        struct inode *inode = file_inode(filp);
+        struct inode *inode = file_inode(file);
         struct super_block *sb = inode->i_sb;
         char *buf;
         unsigned int offset;
-        int copied;
 
         /* Offset within the thing. */
-        offset = filp->f_pos;
-        if (offset >= inode->i_size)
+        if (ctx->pos >= inode->i_size)
                 return 0;
+        offset = ctx->pos;
         /* Directory entries are always 4-byte aligned */
         if (offset & 3)
                 return -EINVAL;
@@ -369,14 +368,13 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         if (!buf)
                 return -ENOMEM;
 
-        copied = 0;
         while (offset < inode->i_size) {
                 struct cramfs_inode *de;
                 unsigned long nextoffset;
                 char *name;
                 ino_t ino;
                 umode_t mode;
-                int namelen, error;
+                int namelen;
 
                 mutex_lock(&read_mutex);
                 de = cramfs_read(sb, OFFSET(inode) + offset, sizeof(*de)+CRAMFS_MAXPATHLEN);
@@ -402,13 +400,10 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                 break;
                         namelen--;
                 }
-                error = filldir(dirent, buf, namelen, offset, ino, mode >> 12);
-                if (error)
+                if (!dir_emit(ctx, buf, namelen, ino, mode >> 12))
                         break;
 
-                offset = nextoffset;
-                filp->f_pos = offset;
-                copied++;
+                ctx->pos = offset = nextoffset;
         }
         kfree(buf);
         return 0;
@@ -547,7 +542,7 @@ static const struct address_space_operations cramfs_aops = {
 static const struct file_operations cramfs_directory_operations = {
         .llseek         = generic_file_llseek,
         .read           = generic_read_dir,
-        .readdir        = cramfs_readdir,
+        .iterate        = cramfs_readdir,
 };
 
 static const struct inode_operations cramfs_dir_inode_operations = {