Signed-off-by: David Sterba <dsterba@xxxxxxx>
---
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
--
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
