summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2014-02-25 19:32:59 +0100
committerJosef Bacik <jbacik@fb.com>2014-03-10 15:16:58 -0400
commit1b2782c8ed24db03ad49942fa37c9f196b7c4af3 (patch)
treed17bf2906f08350ecb62ec4fe9dce3b843d7609f /fs/btrfs
parent176840b3aa3cb795ddec4fc665ffbd707abff906 (diff)
downloadop-kernel-dev-1b2782c8ed24db03ad49942fa37c9f196b7c4af3.zip
op-kernel-dev-1b2782c8ed24db03ad49942fa37c9f196b7c4af3.tar.gz
btrfs: send: fix old buffer length in fs_path_ensure_buf
In "btrfs: send: lower memory requirements in common case" the code to save the old_buf_len was incorrectly moved to a wrong place and broke the original logic. Reported-by: Filipe David Manana <fdmanana@gmail.com> Signed-off-by: David Sterba <dsterba@suse.cz> Reviewed-by: Filipe David Manana <fdmanana@gmail.com> Signed-off-by: Josef Bacik <jbacik@fb.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/send.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 298e25d..246df85 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -346,6 +346,9 @@ static int fs_path_ensure_buf(struct fs_path *p, int len)
if (p->buf_len >= len)
return 0;
+ path_len = p->end - p->start;
+ old_buf_len = p->buf_len;
+
/*
* First time the inline_buf does not suffice
*/
@@ -368,9 +371,6 @@ static int fs_path_ensure_buf(struct fs_path *p, int len)
p->buf_len = ksize(p->buf);
}
- path_len = p->end - p->start;
- old_buf_len = p->buf_len;
-
if (p->reversed) {
tmp_buf = p->buf + old_buf_len - path_len - 1;
p->end = p->buf + p->buf_len - 1;
OpenPOWER on IntegriCloud