3 files changed, 18 insertions, 24 deletions

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index e88f46f122aa..035f9a345cdf 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -736,7 +736,8 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb,
                                                   get_data_block_ro);
 }
 
-static void f2fs_invalidate_data_page(struct page *page, unsigned long offset)
+static void f2fs_invalidate_data_page(struct page *page, unsigned int offset,
+                                      unsigned int length)
 {
         struct inode *inode = page->mapping->host;
         struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 4f21452f929d..9d1cd423450d 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -606,24 +606,19 @@ bool f2fs_empty_dir(struct inode *dir)
         return true;
 }
 
-static int f2fs_readdir(struct file *file, void *dirent, filldir_t filldir)
+static int f2fs_readdir(struct file *file, struct dir_context *ctx)
 {
-        unsigned long pos = file->f_pos;
         struct inode *inode = file_inode(file);
         unsigned long npages = dir_blocks(inode);
-        unsigned char *types = NULL;
         unsigned int bit_pos = 0, start_bit_pos = 0;
-        int over = 0;
         struct f2fs_dentry_block *dentry_blk = NULL;
         struct f2fs_dir_entry *de = NULL;
         struct page *dentry_page = NULL;
-        unsigned int n = 0;
+        unsigned int n = ((unsigned long)ctx->pos / NR_DENTRY_IN_BLOCK);
         unsigned char d_type = DT_UNKNOWN;
         int slots;
 
-        types = f2fs_filetype_table;
-        bit_pos = (pos % NR_DENTRY_IN_BLOCK);
-        n = (pos / NR_DENTRY_IN_BLOCK);
+        bit_pos = ((unsigned long)ctx->pos % NR_DENTRY_IN_BLOCK);
 
         for ( ; n < npages; n++) {
                 dentry_page = get_lock_data_page(inode, n);
@@ -633,31 +628,28 @@ static int f2fs_readdir(struct file *file, void *dirent, filldir_t filldir)
                 start_bit_pos = bit_pos;
                 dentry_blk = kmap(dentry_page);
                 while (bit_pos < NR_DENTRY_IN_BLOCK) {
-                        d_type = DT_UNKNOWN;
                         bit_pos = find_next_bit_le(&dentry_blk->dentry_bitmap,
                                                         NR_DENTRY_IN_BLOCK,
                                                         bit_pos);
                         if (bit_pos >= NR_DENTRY_IN_BLOCK)
                                 break;
 
+                        ctx->pos += bit_pos - start_bit_pos;
                         de = &dentry_blk->dentry[bit_pos];
-                        if (types && de->file_type < F2FS_FT_MAX)
-                                d_type = types[de->file_type];
-
-                        over = filldir(dirent,
-                                        dentry_blk->filename[bit_pos],
-                                        le16_to_cpu(de->name_len),
-                                        (n * NR_DENTRY_IN_BLOCK) + bit_pos,
-                                        le32_to_cpu(de->ino), d_type);
-                        if (over) {
-                                file->f_pos += bit_pos - start_bit_pos;
+                        if (de->file_type < F2FS_FT_MAX)
+                                d_type = f2fs_filetype_table[de->file_type];
+                        else
+                                d_type = DT_UNKNOWN;
+                        if (!dir_emit(ctx,
+                                      dentry_blk->filename[bit_pos],
+                                      le16_to_cpu(de->name_len),
+                                      le32_to_cpu(de->ino), d_type))
                                 goto success;
-                        }
                         slots = GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));
                         bit_pos += slots;
                 }
                 bit_pos = 0;
-                file->f_pos = (n + 1) * NR_DENTRY_IN_BLOCK;
+                ctx->pos = (n + 1) * NR_DENTRY_IN_BLOCK;
                 kunmap(dentry_page);
                 f2fs_put_page(dentry_page, 1);
                 dentry_page = NULL;
@@ -674,7 +666,7 @@ success:
 const struct file_operations f2fs_dir_operations = {
         .llseek         = generic_file_llseek,
         .read           = generic_read_dir,
-        .readdir        = f2fs_readdir,
+        .iterate        = f2fs_readdir,
         .fsync          = f2fs_sync_file,
         .unlocked_ioctl = f2fs_ioctl,
 };
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index b02440c5b2eb..b418aee09573 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1208,7 +1208,8 @@ static int f2fs_set_node_page_dirty(struct page *page)
         return 0;
 }
 
-static void f2fs_invalidate_node_page(struct page *page, unsigned long offset)
+static void f2fs_invalidate_node_page(struct page *page, unsigned int offset,
+                                      unsigned int length)
 {
         struct inode *inode = page->mapping->host;
         struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);