xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus

Browse Source 
Signed-off-by: Chris Mason <clm@fb.com>

Conflicts:
	fs/btrfs/extent_io.c
This commit is contained in:
Chris Mason
2014-10-04 09:56:45 -07:00
parent bf8e8ca6fd fccb84c94a
commit bbf65cf0b5
17 changed files with 130 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/relocation.c
View File

@@ -2349,7 +2349,7 @@ void free_reloc_roots(struct list_head *list)
}
static noinline_for_stack
int merge_reloc_roots(struct reloc_control *rc)
void merge_reloc_roots(struct reloc_control *rc)
{
struct btrfs_root *root;
struct btrfs_root *reloc_root;
@@ -2430,7 +2430,6 @@ out:
}
BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root));
return ret;
}
static void free_block_list(struct rb_root *blocks)