evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

btrfs: send: simplify allocation code in fs_path_ensure_buf

Browse source 
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fb.com>
This commit is contained in:
David Sterba 2014-02-25 19:33:08 +01:00 • committed by Josef Bacik
parent 1b2782c8ed
commit 9c9ca00bd3
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
fs/btrfs/send.c
View file

@ -352,24 +352,18 @@ static int fs_path_ensure_buf(struct fs_path *p, int len)
/* /*
* First time the inline_buf does not suffice * First time the inline_buf does not suffice
*/ */
if (p->buf == p->inline_buf) { if (p->buf == p->inline_buf)
p->buf = kmalloc(len, GFP_NOFS); tmp_buf = kmalloc(len, GFP_NOFS);
if (!p->buf) else
return -ENOMEM; tmp_buf = krealloc(p->buf, len, GFP_NOFS);
/* if (!tmp_buf)
* The real size of the buffer is bigger, this will let the return -ENOMEM;
* fast path happen most of the time p->buf = tmp_buf;
*/ /*
p->buf_len = ksize(p->buf); * The real size of the buffer is bigger, this will let the fast path
} else { * happen most of the time
char *tmp; */
p->buf_len = ksize(p->buf);
tmp = krealloc(p->buf, len, GFP_NOFS);
if (!tmp)
return -ENOMEM;
p->buf = tmp;
p->buf_len = ksize(p->buf);
}
if (p->reversed) { if (p->reversed) {
tmp_buf = p->buf + old_buf_len - path_len - 1; tmp_buf = p->buf + old_buf_len - path_len - 1;