[PATCH 0/2] Btrfs send fixup

[PATCH 0/2] Btrfs send fixup

[David Sterba]

A fix for the problem that Filipe pointed out and a cleanup in the same code,
depends on the first patch.

Based on btrfs-next/master.

David Sterba (2):
  btrfs: send: fix old buffer length in fs_path_ensure_buf
  btrfs: send: simplify allocation code in fs_path_ensure_buf

 fs/btrfs/send.c |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

-- 
1.7.9

[PATCH 1/2] btrfs: send: fix old buffer length in fs_path_ensure_buf

[David Sterba]

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>
---
 fs/btrfs/send.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index b6d416ce6b3b..613f4bc93571 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -288,6 +288,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
 	 */
@@ -310,9 +313,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;
-- 
1.7.9

Re: [PATCH 1/2] btrfs: send: fix old buffer length in fs_path_ensure_buf

[Filipe David Manana]

On Tue, Feb 25, 2014 at 6:32 PM, David Sterba <dsterba@suse.cz> wrote:
> 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>

Thanks David.

> ---
>  fs/btrfs/send.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
> index b6d416ce6b3b..613f4bc93571 100644
> --- a/fs/btrfs/send.c
> +++ b/fs/btrfs/send.c
> @@ -288,6 +288,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
>          */
> @@ -310,9 +313,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;
> --
> 1.7.9
>
> --
> 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



-- 
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

[PATCH 2/2] btrfs: send: simplify allocation code in fs_path_ensure_buf

[David Sterba]

Signed-off-by: David Sterba <dsterba@suse.cz>
---
 fs/btrfs/send.c |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 613f4bc93571..31b9c59eb087 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -294,24 +294,18 @@ static int fs_path_ensure_buf(struct fs_path *p, int len)
 	/*
 	 * First time the inline_buf does not suffice
 	 */
-	if (p->buf == p->inline_buf) {
-		p->buf = kmalloc(len, GFP_NOFS);
-		if (!p->buf)
-			return -ENOMEM;
-		/*
-		 * The real size of the buffer is bigger, this will let the
-		 * fast path happen most of the time
-		 */
-		p->buf_len = ksize(p->buf);
-	} else {
-		char *tmp;
-
-		tmp = krealloc(p->buf, len, GFP_NOFS);
-		if (!tmp)
-			return -ENOMEM;
-		p->buf = tmp;
-		p->buf_len = ksize(p->buf);
-	}
+	if (p->buf == p->inline_buf)
+		tmp_buf = kmalloc(len, GFP_NOFS);
+	else
+		tmp_buf = krealloc(p->buf, len, GFP_NOFS);
+	if (!tmp_buf)
+		return -ENOMEM;
+	p->buf = tmp_buf;
+	/*
+	 * The real size of the buffer is bigger, this will let the fast path
+	 * happen most of the time
+	 */
+	p->buf_len = ksize(p->buf);
 
 	if (p->reversed) {
 		tmp_buf = p->buf + old_buf_len - path_len - 1;
-- 
1.7.9