btrfs: increment ctx->pos for every emitted or skipped dirent in readdir

If we process the last item in the leaf and hit an I/O error while
reading the next leaf, we return -EIO without having adjusted the
position.  Since we have emitted dirents, getdents() will return
the byte count to the user instead of the error.  Subsequent callers
will emit the last successful dirent again, and return -EIO again,
with the same result.  Callers loop forever.

Instead, if we always increment ctx->pos after emitting or skipping
the dirent, we'll be sure that we won't hit the same one again.  When
we go to process the next leaf, we won't have emitted any dirents
and the -EIO will be returned to the user properly.  We also don't
need to track if we've emitted a dirent already or if we've changed
the position yet.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 0fcf5f25d524ab632a21f4853eff43baf7fb5e25..d90d4446f9fe88371e114afaee02f894ad75db63 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1686,7 +1686,7 @@ int btrfs_should_delete_dir_index(struct list_head *del_list,
  *
  */
 int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,
-                                   struct list_head *ins_list, bool *emitted)
+                                   struct list_head *ins_list)
 {
        struct btrfs_dir_item *di;
        struct btrfs_delayed_item *curr, *next;
@@ -1730,7 +1730,6 @@ int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,
 
                if (over)
                        return 1;
-               *emitted = true;
        }
        return 0;
 }

diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
index 2495b3d4075f81538fde3ad0ca020648c164db91..2c1cbe24510405e9fd0cd1f83ca850b687bac1d1 100644 (file)
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
@@ -146,7 +146,7 @@ void btrfs_readdir_put_delayed_items(struct inode *inode,
 int btrfs_should_delete_dir_index(struct list_head *del_list,
                                  u64 index);
 int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,
-                                   struct list_head *ins_list, bool *emitted);
+                                   struct list_head *ins_list);
 
 /* for init */
 int __init btrfs_delayed_inode_init(void);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index df84d76f124ac567a6bcde6f4c005596301682f7..0b836737d3827a8fe25e0e7bff720a32f07391b3 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5807,8 +5807,6 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
        char tmp_name[32];
        char *name_ptr;
        int name_len;
-       int is_curr = 0;        /* ctx->pos points to the current index? */
-       bool emitted;
        bool put = false;
        struct btrfs_key location;
 
@@ -5833,7 +5831,6 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
        if (ret < 0)
                goto err;
 
-       emitted = false;
        while (1) {
                leaf = path->nodes[0];
                slot = path->slots[0];
@@ -5859,7 +5856,6 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
                        goto next;
 
                ctx->pos = found_key.offset;
-               is_curr = 1;
 
                di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item);
                if (verify_dir_item(root, leaf, di))
@@ -5887,31 +5883,17 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
                if (name_ptr != tmp_name)
                        kfree(name_ptr);
 
-                       emitted = true;
                if (over)
                        goto nopos;
+               ctx->pos++;
 next:
                path->slots[0]++;
        }
 
-       if (is_curr)
-               ctx->pos++;
-       ret = btrfs_readdir_delayed_dir_index(ctx, &ins_list, &emitted);
+       ret = btrfs_readdir_delayed_dir_index(ctx, &ins_list);
        if (ret)
                goto nopos;
 
-       /*
-        * If we haven't emitted any dir entry, we must not touch ctx->pos as
-        * it was was set to the termination value in previous call. We assume
-        * that "." and ".." were emitted if we reach this point and set the
-        * termination value as well for an empty directory.
-        */
-       if (ctx->pos > 2 && !emitted)
-               goto nopos;
-
-       /* Reached end of directory/root. Bump pos past the last item. */
-       ctx->pos++;
-
        /*
         * Stop new entries from being returned after we return the last
         * entry.