1 files changed, 4 insertions, 19 deletions

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index f26f38ccd194..375510913fe7 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -535,20 +535,6 @@ static struct btrfs_delayed_item *__btrfs_next_delayed_item(
         return next;
 }
 
-static inline struct btrfs_root *btrfs_get_fs_root(struct btrfs_root *root,
-                                                   u64 root_id)
-{
-        struct btrfs_key root_key;
-
-        if (root->objectid == root_id)
-                return root;
-
-        root_key.objectid = root_id;
-        root_key.type = BTRFS_ROOT_ITEM_KEY;
-        root_key.offset = (u64)-1;
-        return btrfs_read_fs_root_no_name(root->fs_info, &root_key);
-}
-
 static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans,
                                                struct btrfs_root *root,
                                                struct btrfs_delayed_item *item)
@@ -1681,8 +1667,7 @@ int btrfs_should_delete_dir_index(struct list_head *del_list,
  * btrfs_readdir_delayed_dir_index - read dir info stored in the delayed tree
  *
  */
-int btrfs_readdir_delayed_dir_index(struct file *filp, void *dirent,
-                                    filldir_t filldir,
+int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,
                                     struct list_head *ins_list)
 {
         struct btrfs_dir_item *di;
@@ -1704,13 +1689,13 @@ int btrfs_readdir_delayed_dir_index(struct file *filp, void *dirent,
         list_for_each_entry_safe(curr, next, ins_list, readdir_list) {
                 list_del(&curr->readdir_list);
 
-                if (curr->key.offset < filp->f_pos) {
+                if (curr->key.offset < ctx->pos) {
                         if (atomic_dec_and_test(&curr->refs))
                                 kfree(curr);
                         continue;
                 }
 
-                filp->f_pos = curr->key.offset;
+                ctx->pos = curr->key.offset;
 
                 di = (struct btrfs_dir_item *)curr->data;
                 name = (char *)(di + 1);
@@ -1719,7 +1704,7 @@ int btrfs_readdir_delayed_dir_index(struct file *filp, void *dirent,
                 d_type = btrfs_filetype_table[di->type];
                 btrfs_disk_key_to_cpu(&location, &di->location);
 
-                over = filldir(dirent, name, name_len, curr->key.offset,
+                over = !dir_emit(ctx, name, name_len,
                                location.objectid, d_type);
 
                 if (atomic_dec_and_test(&curr->refs))