| Message ID | 1370384280-28652-2-git-send-email-zab@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On tue, 4 Jun 2013 15:17:55 -0700, Zach Brown wrote: > The only time we need to advance f_pos is after we've successfully given > a result to userspace via filldir. This simplification gets rid of the > is_curr variable used to update f_pos for the delayed item readdir > entries. > > Signed-off-by: Zach Brown <zab@redhat.com> Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> > --- > fs/btrfs/delayed-inode.c | 5 +++-- > fs/btrfs/inode.c | 17 +++++++---------- > 2 files changed, 10 insertions(+), 12 deletions(-) > > diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c > index 5615eac..4d846a2 100644 > --- a/fs/btrfs/delayed-inode.c > +++ b/fs/btrfs/delayed-inode.c > @@ -1696,8 +1696,6 @@ int btrfs_readdir_delayed_dir_index(struct file *filp, void *dirent, > continue; > } > > - filp->f_pos = curr->key.offset; > - > di = (struct btrfs_dir_item *)curr->data; > name = (char *)(di + 1); > name_len = le16_to_cpu(di->name_len); > @@ -1708,6 +1706,9 @@ int btrfs_readdir_delayed_dir_index(struct file *filp, void *dirent, > over = filldir(dirent, name, name_len, curr->key.offset, > location.objectid, d_type); > > + if (!over) > + filp->f_pos = curr->key.offset + 1; > + > if (atomic_dec_and_test(&curr->refs)) > kfree(curr); > > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index b11a95e..6a5784b 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -5007,7 +5007,6 @@ static int btrfs_real_readdir(struct file *filp, void *dirent, > char tmp_name[32]; > char *name_ptr; > int name_len; > - int is_curr = 0; /* filp->f_pos points to the current index? */ > > /* FIXME, use a real flag for deciding about the key type */ > if (root->fs_info->tree_root == root) > @@ -5076,9 +5075,6 @@ static int btrfs_real_readdir(struct file *filp, void *dirent, > found_key.offset)) > goto next; > > - filp->f_pos = found_key.offset; > - is_curr = 1; > - > di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item); > di_cur = 0; > di_total = btrfs_item_size(leaf, item); > @@ -5130,6 +5126,9 @@ skip: > > if (over) > goto nopos; > + > + filp->f_pos = found_key.offset + 1; > + > di_len = btrfs_dir_name_len(leaf, di) + > btrfs_dir_data_len(leaf, di) + sizeof(*di); > di_cur += di_len; > @@ -5140,23 +5139,21 @@ next: > } > > if (key_type == BTRFS_DIR_INDEX_KEY) { > - if (is_curr) > - filp->f_pos++; > ret = btrfs_readdir_delayed_dir_index(filp, dirent, filldir, > &ins_list); > if (ret) > goto nopos; > } > > - /* Reached end of directory/root. Bump pos past the last item. */ > - if (key_type == BTRFS_DIR_INDEX_KEY) > + /* Reached end of directory/root */ > + if (key_type == BTRFS_DIR_INDEX_KEY) { > /* > * 32-bit glibc will use getdents64, but then strtol - > * so the last number we can serve is this. > */ > filp->f_pos = 0x7fffffff; > - else > - filp->f_pos++; > + } > + > nopos: > ret = 0; > err: > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 5615eac..4d846a2 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1696,8 +1696,6 @@ int btrfs_readdir_delayed_dir_index(struct file *filp, void *dirent, continue; } - filp->f_pos = curr->key.offset; - di = (struct btrfs_dir_item *)curr->data; name = (char *)(di + 1); name_len = le16_to_cpu(di->name_len); @@ -1708,6 +1706,9 @@ int btrfs_readdir_delayed_dir_index(struct file *filp, void *dirent, over = filldir(dirent, name, name_len, curr->key.offset, location.objectid, d_type); + if (!over) + filp->f_pos = curr->key.offset + 1; + if (atomic_dec_and_test(&curr->refs)) kfree(curr); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b11a95e..6a5784b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5007,7 +5007,6 @@ static int btrfs_real_readdir(struct file *filp, void *dirent, char tmp_name[32]; char *name_ptr; int name_len; - int is_curr = 0; /* filp->f_pos points to the current index? */ /* FIXME, use a real flag for deciding about the key type */ if (root->fs_info->tree_root == root) @@ -5076,9 +5075,6 @@ static int btrfs_real_readdir(struct file *filp, void *dirent, found_key.offset)) goto next; - filp->f_pos = found_key.offset; - is_curr = 1; - di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item); di_cur = 0; di_total = btrfs_item_size(leaf, item); @@ -5130,6 +5126,9 @@ skip: if (over) goto nopos; + + filp->f_pos = found_key.offset + 1; + di_len = btrfs_dir_name_len(leaf, di) + btrfs_dir_data_len(leaf, di) + sizeof(*di); di_cur += di_len; @@ -5140,23 +5139,21 @@ next: } if (key_type == BTRFS_DIR_INDEX_KEY) { - if (is_curr) - filp->f_pos++; ret = btrfs_readdir_delayed_dir_index(filp, dirent, filldir, &ins_list); if (ret) goto nopos; } - /* Reached end of directory/root. Bump pos past the last item. */ - if (key_type == BTRFS_DIR_INDEX_KEY) + /* Reached end of directory/root */ + if (key_type == BTRFS_DIR_INDEX_KEY) { /* * 32-bit glibc will use getdents64, but then strtol - * so the last number we can serve is this. */ filp->f_pos = 0x7fffffff; - else - filp->f_pos++; + } + nopos: ret = 0; err:
The only time we need to advance f_pos is after we've successfully given a result to userspace via filldir. This simplification gets rid of the is_curr variable used to update f_pos for the delayed item readdir entries. Signed-off-by: Zach Brown <zab@redhat.com> --- fs/btrfs/delayed-inode.c | 5 +++-- fs/btrfs/inode.c | 17 +++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-)