btrfs: send: simplify allocation code in fs_path_ensure_buf

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fb.com>

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 246df8513c8a67b2d7a63c0dc0370f2bfe2c1e4d..ba23fef3c5e5ffb457295e5425e6717494035ce7 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -352,24 +352,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;