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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Feb 25, 2014 at 6:32 PM, David Sterba <dsterba@xxxxxxx> 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@xxxxxxxxx>
> Signed-off-by: David Sterba <dsterba@xxxxxxx>

Reviewed-by: Filipe David Manana <fdmanana@xxxxxxxxx>

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@xxxxxxxxxxxxxxx
> 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."
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux